[debuginfo-tests] 7f738c8 - Fix a brain-fail with debuginfo-tests/dexter internal tests
Jeremy Morse via llvm-commits
llvm-commits at lists.llvm.org
Fri Nov 1 05:37:08 PDT 2019
Author: Jeremy Morse
Date: 2019-11-01T12:35:38Z
New Revision: 7f738c811ac434fc70658cd5ed39b9a36605b561
URL: https://github.com/llvm/llvm-project/commit/7f738c811ac434fc70658cd5ed39b9a36605b561
DIFF: https://github.com/llvm/llvm-project/commit/7f738c811ac434fc70658cd5ed39b9a36605b561.diff
LOG: Fix a brain-fail with debuginfo-tests/dexter internal tests
I baked the "test" subcommand into the %dexter substituion, as that's
what all of the dexter tests use. However I forgot about the internal
tests for whether dexters features are working. Install a %dexter_base
command to allow those tests to call dexter.py directly, and un-xfail
the tests on darwin.
Update too the list of paths the unittests shouldn't try and cover, as it
tries to load dbgeng on unix machines. Ideally we wouldn't be using this
method of test discovery in the future.
Added:
Modified:
debuginfo-tests/dexter/dex/utils/UnitTests.py
debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp
debuginfo-tests/dexter/feature_tests/subtools/help/help.test
debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test
debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
debuginfo-tests/dexter/feature_tests/subtools/view.cpp
debuginfo-tests/dexter/feature_tests/unittests/run.test
debuginfo-tests/lit.cfg.py
Removed:
################################################################################
diff --git a/debuginfo-tests/dexter/dex/utils/UnitTests.py b/debuginfo-tests/dexter/dex/utils/UnitTests.py
index 5a8a0a6aeb90..cfddce5c3110 100644
--- a/debuginfo-tests/dexter/dex/utils/UnitTests.py
+++ b/debuginfo-tests/dexter/dex/utils/UnitTests.py
@@ -31,6 +31,8 @@ def _match_path(self, path, full_path, pattern):
else:
if d == 'windows':
return False
+ elif d == 'dbgeng':
+ return False
return fnmatch(path, pattern)
diff --git a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
index 2d7c202f4075..476906846793 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: not %dexter test --fail-lt 1.0 -w \
+// RUN: not %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -glldb" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_program_state.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
index 54f363e6fd0b..9612c068ad61 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: not %dexter test --fail-lt 1.0 -w \
+// RUN: not %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_step_kinds.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
index 84d2ab81d55e..e52a7fffe203 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: not %dexter test --fail-lt 1.0 -w \
+// RUN: not %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_step_order.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
index a619a6d224f1..145eeed7ef86 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: not %dexter test --fail-lt 1.0 -w \
+// RUN: not %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_watch_type.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
index ea30bc53a1b1..b4c60fa32179 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: not %dexter test --fail-lt 1.0 -w \
+// RUN: not %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_watch_value.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp b/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
index b089e6f6498c..5cea1c4257d0 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: not %dexter test --fail-lt 1.0 -w \
+// RUN: not %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: unreachable.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
index 71d56bcc448f..ebb4766f089a 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -glldb" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_program_state.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
index a4fa5330f35e..3ff0e9fecbc6 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
@@ -7,7 +7,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: direction.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
index 46a13143c504..d5ab3ffbd036 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
@@ -5,7 +5,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: func.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
index 4ca8d1e746da..6dff5c802968 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
@@ -3,8 +3,10 @@
// for a trivial test. Expect one 'FUNC_EXTERNAL' per external call.
//
// REQUIRES: system-linux, lldb
+// XFAIL: system-linux
+// This fails right now on my linux machine, needs examining as to why.
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: func_external.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
index dd4af84363bf..f2b54e442679 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
@@ -5,7 +5,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: recursive.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
index b85aab1d8482..1f9060747ec2 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
@@ -5,7 +5,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: small_loop.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
index cadc0387d9b8..a89a0cee3cc5 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_step_order.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
index b98ef28ad98a..41593837a9c8 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_watch_type.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
index 7f4c365cab6e..035e41136980 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: expect_watch_value.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp b/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
index c53e07fe4a4a..b158b4851be4 100644
--- a/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
+++ b/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
@@ -4,7 +4,7 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: unreachable.cpp:
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp b/debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp
index bc625da0e53b..b0e1aabbe8df 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/clang-opt-bisect/clang-opt-bisect.cpp
@@ -4,7 +4,7 @@
// REQUIRES: system-linux, lldb
//
// RUN: true
-// RUN: %dexter clang-opt-bisect --debugger 'lldb' --builder 'clang' \
+// RUN: %dexter_base clang-opt-bisect --debugger 'lldb' --builder 'clang' \
// RUN: --cflags "-O0 -g" -- %s \
// RUN: | FileCheck %s
// CHECK: running pass 0
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/help/help.test b/debuginfo-tests/dexter/feature_tests/subtools/help/help.test
index afc46526f167..fc3f45539236 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/help/help.test
+++ b/debuginfo-tests/dexter/feature_tests/subtools/help/help.test
@@ -1,8 +1,7 @@
-XFAIL: darwin
Purpose:
Check the `help` subtool runs.
-RUN: %dexter help | FileCheck %s
+RUN: %dexter_base help | FileCheck %s
CHECK: The following subtools are available:
CHECK: clang-opt-bisect
CHECK: help
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test b/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test
index 2f9feaace445..bbc9dd501b00 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test
+++ b/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test
@@ -1,8 +1,7 @@
-XFAIL: darwin
Purpose:
Check the `list-debuggers` subtool runs.
-RUN: %dexter list-debuggers | FileCheck %s
+RUN: %dexter_base list-debuggers | FileCheck %s
CHECK: lldb
CHECK: vs2015
CHECK: vs2017
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
index a688bb02bc28..feb26a737870 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
@@ -1,4 +1,3 @@
-// XFAIL: darwin
// Purpose:
// Check that parsing bad commands gives a useful error.
// - Unbalanced parenthesis
@@ -8,7 +7,7 @@
// Note: Despite using 'lldb' as the debugger, lldb is not actually required
// as the test should finish before lldb would be invoked.
//
-// RUN: not %dexter test --builder 'clang' --debugger 'lldb' \
+// RUN: not %dexter_base test --builder 'clang' --debugger 'lldb' \
// RUN: --cflags "-O0 -g" -v -- %s \
// RUN: | FileCheck %s --match-full-lines --strict-whitespace
//
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
index 477d05d9319a..7cbce8de74a3 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
@@ -1,4 +1,3 @@
-// XFAIL: darwin
// Purpose:
// Check that parsing bad commands gives a useful error.
// - Unbalanced parenthesis over multiple lines
@@ -8,7 +7,7 @@
// Note: Despite using 'lldb' as the debugger, lldb is not actually required
// as the test should finish before lldb would be invoked.
//
-// RUN: not %dexter test --builder 'clang' --debugger "lldb" \
+// RUN: not %dexter_base test --builder 'clang' --debugger "lldb" \
// RUN: --cflags "-O0 -g" -v -- %s \
// RUN: | FileCheck %s --match-full-lines --strict-whitespace
//
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
index 8e8e401b467d..a0b8ab71fe6d 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
@@ -1,4 +1,3 @@
-// XFAIL: darwin
// Purpose:
// Check that parsing bad commands gives a useful error.
// - Syntax error (misplaced ',')
@@ -8,7 +7,7 @@
// Note: Despite using 'lldb' as the debugger, lldb is not actually required
// as the test should finish before lldb would be invoked.
//
-// RUN: not %dexter test --builder 'clang' --debugger "lldb" \
+// RUN: not %dexter_base test --builder 'clang' --debugger "lldb" \
// RUN: --cflags "-O0 -g" -v -- %s \
// RUN: | FileCheck %s --match-full-lines --strict-whitespace
//
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
index 98daaa6345c7..f47ddf86f58b 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
@@ -1,4 +1,3 @@
-// XFAIL: darwin
// Purpose:
// Check that parsing bad commands gives a useful error.
// - Syntax error (misplaced ',') over multiple lines
@@ -8,7 +7,7 @@
// Note: Despite using 'lldb' as the debugger, lldb is not actually required
// as the test should finish before lldb would be invoked.
//
-// RUN: not %dexter test --builder 'clang' --debugger "lldb" \
+// RUN: not %dexter_base test --builder 'clang' --debugger "lldb" \
// RUN: --cflags "-O0 -g" -v -- %s \
// RUN: | FileCheck %s --match-full-lines --strict-whitespace
//
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
index 6b09aa99cc80..d42c5a006f70 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
@@ -1,4 +1,3 @@
-// XFAIL: darwin
// Purpose:
// Check that parsing bad commands gives a useful error.
// - Type error (missing args)
@@ -8,7 +7,7 @@
// Note: Despite using 'lldb' as the debugger, lldb is not actually required
// as the test should finish before lldb would be invoked.
//
-// RUN: not %dexter test --builder 'clang' --debugger "lldb" \
+// RUN: not %dexter_base test --builder 'clang' --debugger "lldb" \
// RUN: --cflags "-O0 -g" -v -- %s \
// RUN: | FileCheck %s --match-full-lines --strict-whitespace
//
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp b/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
index cbb5b755e55f..733c0d44ce05 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
@@ -1,4 +1,3 @@
-// XFAIL: darwin
// Purpose:
// Check that parsing bad commands gives a useful error.
// - Type error (missing args) over multple lines
@@ -8,7 +7,7 @@
// Note: Despite using 'lldb' as the debugger, lldb is not actually required
// as the test should finish before lldb would be invoked.
//
-// RUN: not %dexter test --builder 'clang' --debugger "lldb" \
+// RUN: not %dexter_base test --builder 'clang' --debugger "lldb" \
// RUN: --cflags "-O0 -g" -v -- %s \
// RUN: | FileCheck %s --match-full-lines --strict-whitespace
//
diff --git a/debuginfo-tests/dexter/feature_tests/subtools/view.cpp b/debuginfo-tests/dexter/feature_tests/subtools/view.cpp
index 9c4f25733615..43598dbdc9b9 100644
--- a/debuginfo-tests/dexter/feature_tests/subtools/view.cpp
+++ b/debuginfo-tests/dexter/feature_tests/subtools/view.cpp
@@ -3,11 +3,11 @@
//
// REQUIRES: system-linux, lldb
//
-// RUN: %dexter test --fail-lt 1.0 -w \
+// RUN: %dexter_base test --fail-lt 1.0 -w \
// RUN: --builder 'clang' --debugger 'lldb' --cflags "-O0 -g" \
// RUN: --results %t -- %s
//
-// RUN: %dexter view %t/view.cpp.dextIR | FileCheck %s
+// RUN: %dexter_base view %t/view.cpp.dextIR | FileCheck %s
// CHECK: ## BEGIN
// CHECK: ## END
//
diff --git a/debuginfo-tests/dexter/feature_tests/unittests/run.test b/debuginfo-tests/dexter/feature_tests/unittests/run.test
index 1662649b0e81..721732a1bb5a 100644
--- a/debuginfo-tests/dexter/feature_tests/unittests/run.test
+++ b/debuginfo-tests/dexter/feature_tests/unittests/run.test
@@ -1,9 +1,8 @@
-XFAIL: darwin
Purpose:
Run DExTer unit tests.
# Dexter returns 1 when no subtools are specified.
-RUN: not %dexter --unittest=show-all 2>&1 | FileCheck %s
+RUN: not %dexter_base --unittest=show-all 2>&1 | FileCheck %s
CHECK: Ran {{[0-9]+}} tests
CHECK-EMPTY:
diff --git a/debuginfo-tests/lit.cfg.py b/debuginfo-tests/lit.cfg.py
index 82e9b80b06f5..f5a96c69c4d2 100644
--- a/debuginfo-tests/lit.cfg.py
+++ b/debuginfo-tests/lit.cfg.py
@@ -97,13 +97,18 @@ def get_required_attr(config, attr_name):
config.available_features.add('lldb')
# Produce dexter path, lldb path, and combine into the %dexter substitution
+# for running a test.
dexter_path = os.path.join(config.debuginfo_tests_src_root,
'dexter', 'dexter.py')
-dexter_cmd = '"{}" "{}" test'.format(config.python3_executable, dexter_path)
+dexter_test_cmd = '"{}" "{}" test'.format(config.python3_executable, dexter_path)
if lldb_path is not None:
- dexter_cmd += ' --lldb-executable {}'.format(lldb_path)
+ dexter_test_cmd += ' --lldb-executable {}'.format(lldb_path)
+tools.append(ToolSubst('%dexter', dexter_test_cmd))
-tools.append(ToolSubst('%dexter', dexter_cmd))
+# For testing other bits of dexter that aren't under the "test" subcommand,
+# have a %dexter_base substitution.
+dexter_base_cmd = '"{}" "{}"'.format(config.python3_executable, dexter_path)
+tools.append(ToolSubst('%dexter_base', dexter_base_cmd))
tool_dirs = [config.llvm_tools_dir]
More information about the llvm-commits
mailing list