diff options
| author | OCHyams <orlando.hyams@sony.com> | 2021-10-27 15:27:16 +0100 |
|---|---|---|
| committer | OCHyams <orlando.hyams@sony.com> | 2021-10-27 15:39:14 +0100 |
| commit | 6b1599d7a3e4f5642ae7535e5f4203972deb868f (patch) | |
| tree | 49678cd97606bad9dd448b212dbb588c40d8f797 /cross-project-tests/lit.cfg.py | |
| parent | 9b12975cbf32d88a811a81cec3e7394679b62cf5 (diff) | |
| download | llvm-6b1599d7a3e4f5642ae7535e5f4203972deb868f.tar.gz | |
[dexter] Fix failing regression tests
D109833 makes the flags `--builder` and `--binary` mutually exclusive, which
caused some regression tests to fail. Add a new substitution
`%dexter_regression_base` that doesn't include the `--builder`, `--cflags` or
`--ldflags` flags and use that for tests that use the `--binary` flag.
Reviewed By: jmorse
Differential Revision: https://reviews.llvm.org/D112624
Diffstat (limited to 'cross-project-tests/lit.cfg.py')
| -rw-r--r-- | cross-project-tests/lit.cfg.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py index 9af7361a6633..dba13d090f41 100644 --- a/cross-project-tests/lit.cfg.py +++ b/cross-project-tests/lit.cfg.py @@ -153,18 +153,23 @@ else: # Typical command would take the form: # ./path_to_py/python.exe ./path_to_dex/dexter.py test --fail-lt 1.0 -w --builder clang --debugger lldb --cflags '-O0 -g' -dexter_regression_test_command = ' '.join( +# Exclude build flags for %dexter_regression_base. +dexter_regression_test_base = ' '.join( # "python", "dexter.py", test, fail_mode, builder, debugger, cflags, ldflags ['"{}"'.format(sys.executable), '"{}"'.format(dexter_path), 'test', '--fail-lt 1.0 -w', + dexter_regression_test_debugger]) +tools.append(ToolSubst('%dexter_regression_base', dexter_regression_test_base)) + +# Include build flags for %dexter_regression_test. +dexter_regression_test_build = ' '.join([ + dexter_regression_test_base, dexter_regression_test_builder, - dexter_regression_test_debugger, dexter_regression_test_cflags, dexter_regression_test_ldflags]) - -tools.append(ToolSubst('%dexter_regression_test', dexter_regression_test_command)) +tools.append(ToolSubst('%dexter_regression_test', dexter_regression_test_build)) tool_dirs = [config.llvm_tools_dir] |