intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 12:19:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[dexter] Fix failing regression tests

Browse Source 
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
This commit is contained in:
OCHyams
2021-10-27 15:27:16 +01:00
parent 9b12975cbf
commit 6b1599d7a3
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary/commands.dex
View File

@@ -5,7 +5,7 @@
# UNSUPPORTED: system-darwin
#
# RUN: %clang %S/test.cpp -O0 -g -o %t
# RUN: %dexter_regression_test --binary %t %s | FileCheck %s
# RUN: %dexter_regression_base --binary %t %s | FileCheck %s
# CHECK: commands.dex
#
# test.cpp

2
cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/commands.dex
View File

@@ -5,7 +5,7 @@
# UNSUPPORTED: system-darwin
#
# RUN: %clang %S/../source/test.cpp -O0 -g -o %t
# RUN: %dexter_regression_test --binary %t %s | FileCheck %s
# RUN: %dexter_regression_base --binary %t %s | FileCheck %s
# RUN: rm %t
# CHECK: commands.dex
#

2
cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/source_root_dir.dex
View File

@@ -6,7 +6,7 @@
# UNSUPPORTED: system-darwin
# RUN: %clang %S/../source/test.cpp -O0 -g -o %t
# RUN: %dexter_regression_test --binary %t \
# RUN: %dexter_regression_base --binary %t \
# RUN: --source-root-dir="%S/../source" -- %s | FileCheck %s
# RUN: rm %t

2
cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/windows_noncanonical_path/test.dex
View File

@@ -4,7 +4,7 @@
# REQUIRES: system-windows
#
# RUN: %clang "%S/source/test file.cpp" -O0 -g -o %t
# RUN: %dexter_regression_test --binary %t %s | FileCheck %s
# RUN: %dexter_regression_base --binary %t %s | FileCheck %s
# CHECK: test.dex
#
# ./source/test file.cpp

13
cross-project-tests/lit.cfg.py
View File

@@ -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]