[llvm] [Dexter] Update Dexter lit substitutions, making lldb-dap the default (PR #155838)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 28 07:11:50 PDT 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions cpp,c -- cross-project-tests/debuginfo-tests/dexter-tests/aggregate-indirect-arg.cpp cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp cross-project-tests/debuginfo-tests/dexter-tests/asan.c cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp cross-project-tests/debuginfo-tests/dexter-tests/dbg-arg.c cross-project-tests/debuginfo-tests/dexter-tests/deferred_globals.cpp cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/const-branch.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/ctrl-flow.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/implicit-ptr.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/inline-escaping-function.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining-dse.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/loop.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/merged-store.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/ptr-to.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/struct-dse.c cross-project-tests/debuginfo-tests/dexter-tests/memvars/unused-merged-value.c cross-project-tests/debuginfo-tests/dexter-tests/namespace.cpp cross-project-tests/debuginfo-tests/dexter-tests/nrvo-string.cpp cross-project-tests/debuginfo-tests/dexter-tests/optnone-fastmath.cpp cross-project-tests/debuginfo-tests/dexter-tests/optnone-loops.cpp cross-project-tests/debuginfo-tests/dexter-tests/optnone-simple-functions.cpp cross-project-tests/debuginfo-tests/dexter-tests/optnone-struct-and-methods.cpp cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp cross-project-tests/debuginfo-tests/dexter-tests/stack-var.c cross-project-tests/debuginfo-tests/dexter-tests/vla.c cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/expression_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_simple.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_label_kwarg.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_dexdeclarefile.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/source-root-dir.cpp
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp
index d807fa190..75d4a8eb8 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/asan-deque.cpp
@@ -8,7 +8,8 @@
// lldb-8, even outside of dexter, will sometimes trigger an asan fault in
// the debugged process and generally freak out.
-// RUN: %clang++ -std=gnu++11 -O1 -glldb -fsanitize=address -arch x86_64 %s -o %t
+// RUN: %clang++ -std=gnu++11 -O1 -glldb -fsanitize=address -arch x86_64 %s -o
+// %t
// RUN: %dexter --fail-lt 1.0 -w \
// RUN: --binary %t %dexter_lldb_args -- %s
#include <deque>
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining-dse.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining-dse.c
index cded557f4..c9d4b0b3e 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining-dse.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining-dse.c
@@ -9,7 +9,6 @@
//// Check that once-escaped variable 'param' can still be read after we
//// perform inlining + mem2reg, and that we see the DSE'd value 255.
-
int g;
__attribute__((__always_inline__))
static void use(int* p) {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/expression_address.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/expression_address.cpp
index 5335fdd64..85eefd210 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/expression_address.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/expression_address.cpp
@@ -2,8 +2,8 @@
// Test that a \DexDeclareAddress value can be used to compare the
// addresses of two local variables that refer to the same address.
//
-// NB: This test passes with `--debugger lldb-dap` but fails with --debugger lldb
-// XFAIL: !system-windows && !lldb-dap
+// NB: This test passes with `--debugger lldb-dap` but fails with --debugger
+// lldb XFAIL: !system-windows && !lldb-dap
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_simple.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_simple.cpp
index 923f596ab..69fe45c04 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_simple.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_simple.cpp
@@ -12,10 +12,10 @@
// CHECK: limit_steps_simple.cpp
int main() {
- int x = 0;
- x = 1; // DexLabel('start')
- x = 2; // DexLabel('finish_line')
- return 0; // DexLabel('finish')
+ int x = 0;
+ x = 1; // DexLabel('start')
+ x = 2; // DexLabel('finish_line')
+ return 0; // DexLabel('finish')
}
// DexLimitSteps(from_line=ref('start'), to_line=ref('finish'))
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_label_kwarg.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_label_kwarg.cpp
index da1573525..715ca4b53 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_label_kwarg.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_label_kwarg.cpp
@@ -2,7 +2,8 @@
// Check that bad keyword args in \DexLabel are reported.
// Use --binary switch to trick dexter into skipping the build step.
//
-// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args -- %s | FileCheck %s
-// CHECK: parser error:{{.*}}err_label_kwarg.cpp(8): unexpected named args: bad_arg
+// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args
+// -- %s | FileCheck %s CHECK: parser error:{{.*}}err_label_kwarg.cpp(8):
+// unexpected named args: bad_arg
// DexLabel('test', bad_arg=0)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp
index 978450eeb..64e18835c 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp
@@ -3,7 +3,9 @@
// in a \DexLimitSteps command results in a useful error message.
// Use --binary switch to trick dexter into skipping the build step.
//
-// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args -- %s | FileCheck %s
-// CHECK: parser error:{{.*}}err_limit_steps_no_values.cpp(9): expected 0 or at least 2 positional arguments
+// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args
+// -- %s | FileCheck %s CHECK: parser
+// error:{{.*}}err_limit_steps_no_values.cpp(9): expected 0 or at least 2
+// positional arguments
// DexLimitSteps('test')
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
index 7987e0d77..e3bffe379 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp
@@ -8,12 +8,11 @@
// as the test should finish before lldb would be invoked.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \
-// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// \ RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
//
-// CHECK:parser error:{{.*}}err_paren.cpp(22): Unbalanced parenthesis starting here
-// CHECK:// {{Dex}}ExpectWatchValue(
-// CHECK: ^
+// CHECK:parser error:{{.*}}err_paren.cpp(22): Unbalanced parenthesis starting
+// here CHECK:// {{Dex}}ExpectWatchValue( CHECK: ^
int main(){
return 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
index cd9d1d1f8..9f4f2c220 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren_mline.cpp
@@ -8,12 +8,11 @@
// as the test should finish before lldb would be invoked.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \
-// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// \ RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
//
-// CHECK:parser error:{{.*}}err_paren_mline.cpp(23): Unbalanced parenthesis starting here
-// CHECK:{{Dex}}ExpectWatchValue(
-// CHECK: ^
+// CHECK:parser error:{{.*}}err_paren_mline.cpp(23): Unbalanced parenthesis
+// starting here CHECK:{{Dex}}ExpectWatchValue( CHECK: ^
int main(){
return 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
index 092d1e504..f05b9831a 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax.cpp
@@ -8,8 +8,8 @@
// as the test should finish before lldb would be invoked.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \
-// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// \ RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
//
// CHECK:parser error:{{.*}}err_syntax.cpp(21): invalid syntax
// CHECK:// {{Dex}}ExpectWatchValue(,'a', 3, 3, 3, 3, on_line=0)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_dexdeclarefile.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_dexdeclarefile.cpp
index 0fdf255ed..796fbe228 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_dexdeclarefile.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_dexdeclarefile.cpp
@@ -3,8 +3,8 @@
// they appeared in rather than the current declared file.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args -v -- %s \
-// RUN: | FileCheck %s --implicit-check-not=FAIL-FILENAME-MATCH
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// -v -- %s \ RUN: | FileCheck %s --implicit-check-not=FAIL-FILENAME-MATCH
// CHECK: err_syntax_dexdeclarefile.cpp(14): Undeclared address: 'not_been_declared'
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
index 57afe5787..e0992e830 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_syntax_mline.cpp
@@ -8,8 +8,8 @@
// as the test should finish before lldb would be invoked.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \
-// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// \ RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
//
// CHECK:parser error:{{.*}}err_syntax_mline.cpp(24): invalid syntax
// CHECK: ,'a', 3, 3, 3, 3, on_line=0)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
index e9700fc2f..e1c103a10 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type.cpp
@@ -8,8 +8,8 @@
// as the test should finish before lldb would be invoked.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \
-// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// \ RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
//
// CHECK:parser error:{{.*}}err_type.cpp(21): expected at least two args
// CHECK:// {{Dex}}ExpectWatchValue()
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
index 85d0d12cb..b4c35e61a 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_type_mline.cpp
@@ -8,8 +8,8 @@
// as the test should finish before lldb would be invoked.
//
// RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \
-// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args
+// \ RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
//
// CHECK:parser error:{{.*}}err_type_mline.cpp(22): expected at least two args
// CHECK:{{Dex}}ExpectWatchValue(
``````````
</details>
https://github.com/llvm/llvm-project/pull/155838
More information about the llvm-commits
mailing list