diff options
Diffstat (limited to 'test/lit.cfg')
-rw-r--r-- | test/lit.cfg | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/test/lit.cfg b/test/lit.cfg index 4466f0f..6b0ad59 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -24,12 +24,21 @@ if platform.system() == 'Windows': config.environment['PATH'])) config.environment['PATH'] = path +# Choose between lit's internal shell pipeline runner and a real shell. If +# LIT_USE_INTERNAL_SHELL is in the environment, we use that as an override. +use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") +if use_lit_shell: + # 0 is external, "" is default, and everything else is internal. + execute_external = (use_lit_shell == "0") +else: + # Otherwise we default to internal on Windows and external elsewhere, as + # bash on Windows is usually very slow. + execute_external = (not sys.platform in ['win32']) + # testFormat: The test format to use to interpret tests. # # For now we require '&&' between commands, until they get globally killed and # the test runner updated. -execute_external = (platform.system() != 'Windows' - or lit.getBashPath() not in [None, ""]) config.test_format = lit.formats.ShTest(execute_external) # suffixes: A list of file extensions to treat as test files. @@ -219,17 +228,13 @@ if platform.system() not in ['FreeBSD']: config.available_features.add('crash-recovery') # Shell execution -if platform.system() not in ['Windows'] or lit.getBashPath() != '': +if execute_external: config.available_features.add('shell') # Exclude MSYS due to transforming '/' to 'X:/mingwroot/'. if not platform.system() in ['Windows'] or lit.getBashPath() == '': config.available_features.add('shell-preserves-root') -# For tests that require Darwin to run. -if platform.system() in ['Darwin']: - config.available_features.add('system-darwin') - # ANSI escape sequences in non-dumb terminal if platform.system() not in ['Windows']: config.available_features.add('ansi-escape-sequences') |