ba3bddb6f4
On Windows, the PATH env variable is used for locating dynamically
linked librarys, akin to LD_LIBRARY_PATH on Linux.
The tests that run with a dynamically linked libc++ used "--env
PATH=%{lib}" in the test config. This had the unfortunate side effect
of making other tools from PATH unavailable during the runtime of the
tests; in particular, it caused the "executor-has-no-bash" flag to be
set for all those Windows test configs (with the clang-cl static config
being the only one lacking it).
Thus, this increases the number of tests actually included in the
clang-cl dll and all mingw test configs by 9 tests.
The clang-cl static test configuration has been executing those tests
since the "--env PATH=%{lib}" was removed from that test config in
e78223e79e. (For mingw we haven't had a
need to split the test config between shared and static, which means
that the mingw static test config previously ran with --env PATH
needlessly.)
This increases the test coverage for patches like D146398 which
can't be executed in the executor-has-no-bash configs.
Change the default value of the arg.env to an empty array; when we do
pass values to the option, they get passed as an array of strings,
so make sure the variable behaves consistently when no arguments
have been passed.
Differential Revision: https://reviews.llvm.org/D148324
70 lines
2.8 KiB
Python
Executable File
70 lines
2.8 KiB
Python
Executable File
#!/usr/bin/env python
|
|
#===----------------------------------------------------------------------===##
|
|
#
|
|
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
# See https://llvm.org/LICENSE.txt for license information.
|
|
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
#
|
|
#===----------------------------------------------------------------------===##
|
|
|
|
"""run.py is a utility for running a program.
|
|
|
|
It can perform code signing, forward arguments to the program, and return the
|
|
program's error code.
|
|
"""
|
|
|
|
import argparse
|
|
import os
|
|
import platform
|
|
import subprocess
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument('--execdir', type=str, required=True)
|
|
parser.add_argument('--codesign_identity', type=str, required=False, default=None)
|
|
parser.add_argument('--env', type=str, nargs='*', required=False, default=[])
|
|
parser.add_argument('--prepend_env', type=str, nargs='*', required=False, default=[])
|
|
parser.add_argument("command", nargs=argparse.ONE_OR_MORE)
|
|
args = parser.parse_args()
|
|
commandLine = args.command
|
|
|
|
# HACK:
|
|
# If an argument is a file that ends in `.tmp.exe`, assume it is the name
|
|
# of an executable generated by a test file. We call these test-executables
|
|
# below. This allows us to do custom processing like codesigning test-executables.
|
|
# It's also possible for there to be no such executable, for example in the case
|
|
# of a .sh.cpp test.
|
|
isTestExe = lambda exe: exe.endswith('.tmp.exe') and os.path.exists(exe)
|
|
|
|
# Do any necessary codesigning of test-executables found in the command line.
|
|
if args.codesign_identity:
|
|
for exe in filter(isTestExe, commandLine):
|
|
subprocess.check_call(['xcrun', 'codesign', '-f', '-s', args.codesign_identity, exe], env={})
|
|
|
|
# Extract environment variables into a dictionary
|
|
env = {k : v for (k, v) in map(lambda s: s.split('=', 1), args.env)}
|
|
|
|
# Set environment variables where we prepend the given value to the
|
|
# existing environment variable.
|
|
for (k, v) in map(lambda s: s.split('=', 1), args.prepend_env):
|
|
if k in os.environ:
|
|
v = v + os.pathsep + os.environ[k]
|
|
env[k] = v
|
|
|
|
if platform.system() == 'Windows':
|
|
# Pass some extra variables through on Windows:
|
|
# COMSPEC is needed for running subprocesses via std::system().
|
|
if 'COMSPEC' in os.environ:
|
|
env['COMSPEC'] = os.environ.get('COMSPEC')
|
|
# TEMP is needed for placing temp files in a sensible directory.
|
|
if 'TEMP' in os.environ:
|
|
env['TEMP'] = os.environ.get('TEMP')
|
|
|
|
# Run the command line with the given environment in the execution directory.
|
|
return subprocess.call(commandLine, cwd=args.execdir, env=env, shell=False)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
exit(main())
|