Author: hans Date: Tue Sep 4 02:21:35 2018 New Revision: 341349 URL: http://llvm.org/viewvc/llvm-project?rev=341349&view=rev Log: Merging r341244: ------------------------------------------------------------------------ r341244 | tstellar | 2018-08-31 22:15:31 +0200 (Fri, 31 Aug 2018) | 11 lines
lit: Use sys.executable for executing builtin commands Summary: The python executable may not exist on all systems so use sys.executable instead. Reviewers: ddunbar, stella.stamenova Subscribers: delcypher, llvm-commits Differential Revision: https://reviews.llvm.org/D51511 ------------------------------------------------------------------------ Modified: llvm/branches/release_70/ (props changed) llvm/branches/release_70/utils/lit/lit/TestRunner.py Propchange: llvm/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 4 02:21:35 2018 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338841,338902,338915,338968,339073,339091,339166,339179,339184,339190,339225,339316,339319,339411,339492,339515,339533,339535-339536,339600,339636,339674,339769,339822,339883,339895-339896,339945,340158,340303,340416-340417,340455,340641,340691,340751,340820,340839,340900,341094 +/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338841,338902,338915,338968,339073,339091,339166,339179,339184,339190,339225,339316,339319,339411,339492,339515,339533,339535-339536,339600,339636,339674,339769,339822,339883,339895-339896,339945,340158,340303,340416-340417,340455,340641,340691,340751,340820,340839,340900,341094,341244 Modified: llvm/branches/release_70/utils/lit/lit/TestRunner.py URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/utils/lit/lit/TestRunner.py?rev=341349&r1=341348&r2=341349&view=diff ============================================================================== --- llvm/branches/release_70/utils/lit/lit/TestRunner.py (original) +++ llvm/branches/release_70/utils/lit/lit/TestRunner.py Tue Sep 4 02:21:35 2018 @@ -879,7 +879,7 @@ def _executeShCmd(cmd, shenv, results, t # Expand all glob expressions args = expand_glob_expressions(args, cmd_shenv.cwd) if is_builtin_cmd: - args.insert(0, "python") + args.insert(0, sys.executable) args[1] = os.path.join(builtin_commands_dir ,args[1] + ".py") # On Windows, do our own command line quoting for better compatibility _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
