Re-reapply "[Dexter] Remove builder from Dexter"
This patch makes a further attempt to fix the tests broken by the
previous revision by ensuring that the command line for the modified
Dexter tests use -std=gnu++11, in keeping with the old build script.
This reverts commit 5647f2908de90fe07b0805e988cd2e91a1751928.
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
index 350dd45..774c4ea 100644
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -123,17 +123,15 @@
if platform.system() == "Windows":
# The Windows builder script uses lld.
dependencies = ["clang", "lld-link"]
- dexter_regression_test_builder = "clang-cl_vs2015"
+ dexter_regression_test_builder = "clang-cl"
dexter_regression_test_debugger = "dbgeng"
- dexter_regression_test_cflags = "/Zi /Od"
- dexter_regression_test_ldflags = "/Zi"
+ dexter_regression_test_flags = "/Zi /Od"
else:
# Use lldb as the debugger on non-Windows platforms.
dependencies = ["clang", "lldb"]
- dexter_regression_test_builder = "clang"
+ dexter_regression_test_builder = "clang++"
dexter_regression_test_debugger = "lldb"
- dexter_regression_test_cflags = "-O0 -glldb"
- dexter_regression_test_ldflags = ""
+ dexter_regression_test_flags = "-O0 -glldb -std=gnu++11"
tools.append(
ToolSubst("%dexter_regression_test_builder", dexter_regression_test_builder)
@@ -141,17 +139,16 @@
tools.append(
ToolSubst("%dexter_regression_test_debugger", dexter_regression_test_debugger)
)
+ # We don't need to distinguish cflags and ldflags because for Dexter
+ # regression tests we use clang to drive the linker, and so all flags will be
+ # passed in a single command.
tools.append(
- ToolSubst("%dexter_regression_test_cflags", dexter_regression_test_cflags)
- )
- tools.append(
- ToolSubst("%dexter_regression_test_ldflags", dexter_regression_test_cflags)
+ ToolSubst("%dexter_regression_test_flags", dexter_regression_test_flags)
)
# 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'
- # Exclude build flags for %dexter_regression_base.
- dexter_regression_test_base = " ".join(
+ # ./path_to_py/python.exe ./path_to_dex/dexter.py test --fail-lt 1.0 -w --binary %t --debugger lldb --cflags '-O0 -g'
+ dexter_regression_test_run = " ".join(
# "python", "dexter.py", test, fail_mode, builder, debugger, cflags, ldflags
[
'"{}"'.format(sys.executable),
@@ -162,21 +159,16 @@
dexter_regression_test_debugger,
]
)
- tools.append(ToolSubst("%dexter_regression_base", dexter_regression_test_base))
+ tools.append(ToolSubst("%dexter_regression_test_run", dexter_regression_test_run))
# Include build flags for %dexter_regression_test.
dexter_regression_test_build = " ".join(
[
- dexter_regression_test_base,
- "--builder",
dexter_regression_test_builder,
- '--cflags "',
- dexter_regression_test_cflags + '"',
- '--ldflags "',
- dexter_regression_test_ldflags + '"',
+ dexter_regression_test_flags,
]
)
- tools.append(ToolSubst("%dexter_regression_test", dexter_regression_test_build))
+ tools.append(ToolSubst("%dexter_regression_test_build", dexter_regression_test_build))
return dependencies
