[llvm-branch-commits] [llvm] Make script-mode default, change args, update tests accordingly (PR #204367)

Wed Jun 17 08:17:58 PDT 2026

github-actions[bot] wrote:




: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 c,cpp -- 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/global-constant.cpp cross-project-tests/debuginfo-tests/dexter-tests/hello.c cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.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/nrvo.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/realigned-frame.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/control/dex-continue.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex_step_function.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/dex_declare_file.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_out_range.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_zero_nonmatch.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/missing_dex_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_line_range.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_on_line.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/command_line.c cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_after_ref.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_hit_count.cpp 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_declare_address/identical_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/multiple_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/offset_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/self_comparison.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/dex_and_source/test.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_simple.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_hit_count.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/commands/perfect/expect_program_state.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_multiple.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_no_arg.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_small.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_zero_match.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_check_json_step_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_loop.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_value.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_line_mismatch.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_overlapping_ranges.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_same_line_conditional.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/unconditional.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_not_cmd_lineno.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_on_line.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/conditions.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/debug_aggregates.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_function.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_line.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/then_after_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/then_at_frame.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/then_finish.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/then_step_out.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/watch_scope.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_file_paths.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_fn_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_for_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_hit_count_early_exit.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/basic_evaluate.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_aggregates.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_at_frame.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_list_aggregates.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_steps_penalties.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_steps_perfect.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_sublist_aggregates.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_sublist_aggregates_addresses.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/eval_types.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/evaluation/evaluate_nothing.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/floats.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/labels/invalid_label.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/labels/offset.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/labels/simple_labels.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/labels/source_root_dir.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/nested_wheres.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_aggregates_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_at_frame_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_expect_list_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_expects_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_list_aggregates_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_multiple_scripts_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_scopes_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_scopes_list_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/Inputs/rewrite_types_expected.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_aggregates.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_at_frame.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_expect_list.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_expects.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_list_aggregates.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_multiple_scripts.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_scopes.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_scopes_list.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/rewriting/rewrite_types.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/where_hit_count.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/address_printing.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_bad_label_ref.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_address.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_label.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/err_undeclared_addr.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_another_line.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_offset.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/source-root-dir.cpp cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args.c cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args_with_command.c cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/view.cpp --diff_from_common_commit
``````````

: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 1db61d8cd..763ed9681 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 -w \
 // RUN:     --binary %t %dexter_lldb_args -- %s | FileCheck %s
 #include <deque>
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp
index 2d0111401..676260d2c 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/ctor.cpp
@@ -7,8 +7,9 @@
 
 class A {
 public:
-	A() : zero(0), data(42) { // !dex_label ctor_start
-	}
+  A() : zero(0), data(42) { // !dex_label ctor_start
+  }
+
 private:
 	int zero;
 	int data;
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp
index e74a5636c..b558d2797 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp
@@ -1,7 +1,8 @@
 // REQUIRES: system-windows
 //
 // RUN: %clang_cl /Z7 /Zi %s -o %t
-// RUN: %dexter --use-heuristic --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
+// RUN: %dexter --use-heuristic --use-heuristic --fail-lt 1.0 -w --binary %t
+// --debugger 'dbgeng' -- %s
 
 // Check that global constants have debug info.
 
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/hello.c b/cross-project-tests/debuginfo-tests/dexter-tests/hello.c
index 7903739fe..744a94a59 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/hello.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/hello.c
@@ -1,7 +1,8 @@
 // REQUIRES: system-windows
 //
 // RUN: %clang_cl /Z7 /Zi %s -o %t
-// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
+// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng'
+// -- %s
 
 #include <stdio.h>
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp
index a2fbb2b86..a829ea840 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp
@@ -1,7 +1,8 @@
 // REQUIRES: system-windows
 //
 // RUN: %clang_cl /Od /Z7 /Zi %s -o %t
-// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
+// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng'
+// -- %s
 //
 // RUN: %clang_cl /O2 /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t \
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c
index 392dd399f..d92160d17 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/bitcast.c
@@ -66,10 +66,10 @@ int main() {
   int x = getint(5);
   int y = getint(5); // !dex_label s1
   int z = getint(5); // !dex_label s2
-  alias((char*)&x);  // !dex_label s3
+  alias((char *)&x); // !dex_label s3
   alias((char*)&y);
   alias((char*)&z);
-  return 0;          // !dex_label s4
+  return 0; // !dex_label s4
 }
 
 // CHECK-DAG: seen_values: 3
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/const-branch.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/const-branch.c
index d5bed3ca3..0a175b1ae 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/const-branch.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/const-branch.c
@@ -57,4 +57,3 @@ int main() {
   !value param: 5
 ...
 */
-
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ctrl-flow.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ctrl-flow.c
index 8edfc4e1c..17efbae96 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ctrl-flow.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ctrl-flow.c
@@ -15,12 +15,12 @@ void leak(int *ptr) {
 
 __attribute__((__noinline__))
 int fun(int cond) {
-  int local = 0;   // !dex_label s1
+  int local = 0; // !dex_label s1
   if (cond)
     leak(&local);
   else
     local = 1;
-  return local;    // !dex_label s2
+  return local; // !dex_label s2
 }
 
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/implicit-ptr.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/implicit-ptr.c
index 9785eaf12..7cdf924e0 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/implicit-ptr.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/implicit-ptr.c
@@ -30,10 +30,10 @@ static void use_inline(const int* pb) {
 
 __attribute__((__noinline__))
 int fun(int param) {
-  volatile int step = 0;   // !dex_label s1
+  volatile int step = 0; // !dex_label s1
   use_promote(&param);
   use_inline(&param);
-  return step;             // !dex_label s4
+  return step; // !dex_label s4
 }
 
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inline-escaping-function.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inline-escaping-function.c
index 2bd9e1b02..1dd7060f3 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inline-escaping-function.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inline-escaping-function.c
@@ -34,7 +34,7 @@ __attribute__((noinline))
 int fun(int param) {
   if (param)
     param = inlineme(&param);
-  fluff();           // !dex_label s0
+  fluff(); // !dex_label s0
   return param;
 }
 
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 052ae1203..b6f0ff583 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,21 +9,20 @@
 //// 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) {
   g = *p;
   *p = 255;
-  volatile int step = 0;  // !dex_label use1
+  volatile int step = 0; // !dex_label use1
 }
 
 __attribute__((__noinline__))
 void fun(int param) {
   //// Make sure first step is in 'fun'.
-  volatile int step = 0;  // !dex_label fun1
+  volatile int step = 0; // !dex_label fun1
   use(&param);
-  return;                 // !dex_label fun2
+  return; // !dex_label fun2
 }
 
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining.c
index c68f433fc..ad6148d7d 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/inlining.c
@@ -1,7 +1,8 @@
 // REQUIRES: lldb
 // UNSUPPORTED: system-windows
 // RUN: %clang -std=gnu11 -O2 -glldb %s -o %t
-// RUN: %dexter --fail-lt 1.0 -w %dexter_lldb_args --binary %t -- %s | FileCheck %s
+// RUN: %dexter --fail-lt 1.0 -w %dexter_lldb_args --binary %t -- %s | FileCheck
+// %s
 //
 //// Check that the once-escaped variable 'param' can still be read after
 //// we perform inlining + mem2reg. See D89810 and D85555.
@@ -14,9 +15,9 @@ static void use(int* p) {
 
 __attribute__((__noinline__))
 void fun(int param) {
-  volatile int step1 = 0;  // !dex_label s1
+  volatile int step1 = 0; // !dex_label s1
   use(&param);
-  volatile int step2 = 0;  // !dex_label s2
+  volatile int step2 = 0; // !dex_label s2
 }
 
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/loop.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/loop.c
index 115173de5..3fba95df8 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/loop.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/loop.c
@@ -27,7 +27,7 @@ void do_thing(int x) {
 
 __attribute__((__noinline__))
 int fun(int param) {
-  do_thing(0);                        // !dex_label s2
+  do_thing(0); // !dex_label s2
   for (int i = 0; i < param; ++i) {
     use(&param);
   }
@@ -45,7 +45,7 @@ int fun(int param) {
   ////    [0x0000000000400495, 0x00000000004004a2): DW_OP_reg3 RBX)
   //// DW_AT_name       ("param")
 
-  return g;                           // !dex_label s3
+  return g; // !dex_label s3
 }
 
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/merged-store.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/merged-store.c
index 3b6be7f86..a5a085cc5 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/merged-store.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/merged-store.c
@@ -31,7 +31,7 @@ __attribute__((noinline))
 int fun(int parama, int paramb) {
   if (parama)
     parama = paramb;
-  fluff();           // !dex_label s0
+  fluff(); // !dex_label s0
   esc(&parama);
   return 0;
 }
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ptr-to.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ptr-to.c
index 1ca021038..1a65bd5c4 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ptr-to.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/ptr-to.c
@@ -43,7 +43,6 @@ int main() {
 ...
 */
 
-
 // DexExpectWatchValue('local', 0xA, on_line=ref('s1'))
 // DexExpectWatchValue('local', 0xB, on_line=ref('s2'))
 // DexExpectWatchValue('*plocal', 0xA, on_line=ref('s1'))
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/unused-merged-value.c b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/unused-merged-value.c
index 1e5633e58..4f58e083e 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/memvars/unused-merged-value.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/memvars/unused-merged-value.c
@@ -30,7 +30,7 @@ __attribute__((noinline))
 int fun(int parama, int paramb) {
   if (parama)
     parama = paramb;
-  fluff();            // !dex_label s0
+  fluff(); // !dex_label s0
   return paramb;
 }
 
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/namespace.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/namespace.cpp
index 430e22774..fc21d3ac1 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/namespace.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/namespace.cpp
@@ -29,4 +29,3 @@ int main() {
   !value "monkey::ape": 32
 ...
 */
-
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp
index 322917aa1..81599371f 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp
@@ -4,7 +4,8 @@
 // REQUIRES: system-windows, dbgeng-10-19041
 //
 // RUN: %clang_cl /Z7 /Zi %s -o %t
-// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
+// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng'
+// -- %s
 
 struct string {
   string() {}
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-fastmath.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-fastmath.cpp
index 828060e42..3e0f58b79 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-fastmath.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-fastmath.cpp
@@ -21,8 +21,8 @@
 __attribute__((optnone))
 float test_fdiv(float A) {
   float result;
-  result = A / 10.f;  // !dex_label fdiv_assign
-  return result;      // !dex_label fdiv_ret
+  result = A / 10.f; // !dex_label fdiv_assign
+  return result;     // !dex_label fdiv_ret
 }
 
 //// (A * B) - (A * C) ==> A * (B - C)
@@ -30,9 +30,9 @@ __attribute__((optnone))
 float test_distributivity(float A, float B, float C) {
   float result;
   float op1 = A * B;
-  float op2 = A * C;    // !dex_label distributivity_op2
-  result = op1 - op2;   // !dex_label distributivity_result
-  return result;        // !dex_label distributivity_ret
+  float op2 = A * C;  // !dex_label distributivity_op2
+  result = op1 - op2; // !dex_label distributivity_result
+  return result;      // !dex_label distributivity_ret
 }
 
 //// (A + B) + C  == A + (B + C)
@@ -46,7 +46,7 @@ float test_associativity(float A, float B, float C) {
   float result;
   float op1 = A + B;
   float op2 = B + C;
-  op1 += C;           // !dex_label associativity_op1
+  op1 += C; // !dex_label associativity_op1
   op2 += A;
   result = op1 + op2; // !dex_label associativity_result
   return result;      // !dex_label associativity_ret
@@ -67,7 +67,7 @@ float test_simplify_fp_operations(float A, float B) {
   float result = A + 10.0f; // !dex_label fp_operations_result
   result += B;              // !dex_label fp_operations_add
   result -= 10.0f;
-  return result;            // !dex_label fp_operations_ret
+  return result; // !dex_label fp_operations_ret
 }
 
 //// Again, this is a simple return A + B.
@@ -76,8 +76,8 @@ __attribute__((optnone))
 float test_simplify_fp_operations_2(float A, float B, float C) {
   float result = A + C; // !dex_label fp_operations_2_result
   result += B;
-  result -= C;          // !dex_label fp_operations_2_subtract
-  return result;        // !dex_label fp_operations_2_ret
+  result -= C;   // !dex_label fp_operations_2_subtract
+  return result; // !dex_label fp_operations_2_ret
 }
 
 int main() {
@@ -123,7 +123,7 @@ int main() {
     !value A: '9.11999988'
     !value B: '61.050003'
     !value C: '1002.11102'
-  !and {lines: !range [!label fp_operations_2_subtract, !label fp_operations_2_ret]}:
-    !value result: ["1072.28101", "70.1699829"]
+  !and {lines: !range [!label fp_operations_2_subtract, !label
+fp_operations_2_ret]}: !value result: ["1072.28101", "70.1699829"]
 ...
 */
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-loops.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-loops.cpp
index bbba226db..baeb80236 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-loops.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-loops.cpp
@@ -22,7 +22,6 @@ __attribute__((optnone)) void simple_memcpy_loop(int *dest, const int *src,
     dest[i] = src[i]; // !dex_label target_simple_memcpy_loop
 }
 
-
 // A trivial loop that could be optimized into a builtin memcpy
 // which is either expanded into a optimal sequence of mov
 // instructions or directly into a call to memset at plt
@@ -31,7 +30,6 @@ __attribute__((optnone)) void trivial_memcpy_loop(int *dest, const int *src) {
     dest[i] = src[i]; // !dex_label target_trivial_memcpy_loop
 }
 
-
 __attribute__((always_inline)) int foo(int a) { return a + 5; }
 
 // A trivial loop of calls to a 'always_inline' function.
@@ -41,7 +39,6 @@ __attribute__((optnone)) void nonleaf_function_with_loop(int *dest,
     dest[i] = foo(src[i]); // !dex_label target_nonleaf_function_with_loop
 }
 
-
 // This entire function could be optimized into a
 // simple movl %esi, %eax.
 // That is because we can compute the loop trip count
@@ -53,7 +50,6 @@ __attribute__((optnone)) int counting_loop(unsigned values) {
   return i;
 }
 
-
 // This loop could be rotated.
 // while(cond){
 //   ..
@@ -83,7 +79,6 @@ __attribute__((optnone)) int loop_rotate_test(int *src, unsigned count) {
   return result; // !dex_label target_loop_rotate_test_ret
 }
 
-
 typedef int *intptr __attribute__((aligned(16)));
 
 // This loop can be vectorized if we enable
@@ -93,20 +88,25 @@ __attribute__((optnone)) void loop_vectorize_test(intptr dest, intptr src) {
 
   int tempArray[16];
 
-  while(count != 16) { // !dex_label target_loop_vectorize_test
+  while (count != 16) { // !dex_label target_loop_vectorize_test
     tempArray[count] = src[count];
-    tempArray[count+1] = src[count+1]; // !dex_label target_loop_vectorize_test_2
-    tempArray[count+2] = src[count+2]; // !dex_label target_loop_vectorize_test_3
-    tempArray[count+3] = src[count+3]; // !dex_label target_loop_vectorize_test_4
+    tempArray[count + 1] =
+        src[count + 1]; // !dex_label target_loop_vectorize_test_2
+    tempArray[count + 2] =
+        src[count + 2]; // !dex_label target_loop_vectorize_test_3
+    tempArray[count + 3] =
+        src[count + 3];             // !dex_label target_loop_vectorize_test_4
     dest[count] = tempArray[count]; // !dex_label target_loop_vectorize_test_5
-    dest[count+1] = tempArray[count+1]; // !dex_label target_loop_vectorize_test_6
-    dest[count+2] = tempArray[count+2]; // !dex_label target_loop_vectorize_test_7
-    dest[count+3] = tempArray[count+3]; // !dex_label target_loop_vectorize_test_8
-    count += 4; // !dex_label target_loop_vectorize_test_9
+    dest[count + 1] =
+        tempArray[count + 1]; // !dex_label target_loop_vectorize_test_6
+    dest[count + 2] =
+        tempArray[count + 2]; // !dex_label target_loop_vectorize_test_7
+    dest[count + 3] =
+        tempArray[count + 3]; // !dex_label target_loop_vectorize_test_8
+    count += 4;               // !dex_label target_loop_vectorize_test_9
   }
 }
 
-
 int main() {
   int A[] = {3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   int B[] = {13, 14, 15, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
@@ -128,16 +128,13 @@ int main() {
 /*
 ---
 !where {function: simple_memcpy_loop}:
-  !and {lines: !label target_simple_memcpy_loop, conditions: "i == 0 || i == 4 || i == 8"}:
-    !value nelems: 16
-    !value "src[i]": [3, 7, 1]
-!where {function: trivial_memcpy_loop}:
-  !and {lines: !label target_trivial_memcpy_loop, conditions: "i == 3 || i == 7 || i == 9 || i == 14 || i == 15"}:
-    !value i: [3, 7, 9, 14, 15]
-    !value "dest[i-1] == src[i-1]": "true"
-!where {function: nonleaf_function_with_loop}:
-  !and {lines: !label target_nonleaf_function_with_loop, conditions: "i == 1"}:
-    !value "dest[0]": 8
+  !and {lines: !label target_simple_memcpy_loop, conditions: "i == 0 || i == 4
+|| i == 8"}: !value nelems: 16 !value "src[i]": [3, 7, 1] !where {function:
+trivial_memcpy_loop}: !and {lines: !label target_trivial_memcpy_loop,
+conditions: "i == 3 || i == 7 || i == 9 || i == 14 || i == 15"}: !value i: [3,
+7, 9, 14, 15] !value "dest[i-1] == src[i-1]": "true" !where {function:
+nonleaf_function_with_loop}: !and {lines: !label
+target_nonleaf_function_with_loop, conditions: "i == 1"}: !value "dest[0]": 8
     !value "dest[1]": 4
     !value "dest[2]": 5
     !value "src[0]": 8
@@ -154,18 +151,16 @@ int main() {
   !and {lines: !label target_loop_rotate_test_ret, conditions: "result == 158"}:
     !value result: 158
 !where {function: loop_vectorize_test}:
-  !and {lines: !range [!label target_loop_vectorize_test, !label target_loop_vectorize_test_9], conditions: "count == 4 || count == 8 || count == 12 || count == 16"}:
-      !and {lines: !label target_loop_vectorize_test_2}:
-        !value 'tempArray[count] == src[count]': "true"
-      !and {lines: !label target_loop_vectorize_test_3}:
-        !value 'tempArray[count+1] == src[count+1]': "true"
-      !and {lines: !label target_loop_vectorize_test_4}:
-        !value 'tempArray[count+2] == src[count+2]': "true"
-      !and {lines: !label target_loop_vectorize_test_5}:
-        !value 'tempArray[count+3] == src[count+3]': "true"
-      !and {lines: !label target_loop_vectorize_test_6}:
-        !value 'dest[count] == tempArray[count]': "true"
-      !and {lines: !label target_loop_vectorize_test_7}:
+  !and {lines: !range [!label target_loop_vectorize_test, !label
+target_loop_vectorize_test_9], conditions: "count == 4 || count == 8 || count ==
+12 || count == 16"}: !and {lines: !label target_loop_vectorize_test_2}: !value
+'tempArray[count] == src[count]': "true" !and {lines: !label
+target_loop_vectorize_test_3}: !value 'tempArray[count+1] == src[count+1]':
+"true" !and {lines: !label target_loop_vectorize_test_4}: !value
+'tempArray[count+2] == src[count+2]': "true" !and {lines: !label
+target_loop_vectorize_test_5}: !value 'tempArray[count+3] == src[count+3]':
+"true" !and {lines: !label target_loop_vectorize_test_6}: !value 'dest[count] ==
+tempArray[count]': "true" !and {lines: !label target_loop_vectorize_test_7}:
         !value 'dest[count+1] == tempArray[count+1]': "true"
       !and {lines: !label target_loop_vectorize_test_8}:
         !value 'dest[count+2] == tempArray[count+2]': "true"
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-simple-functions.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-simple-functions.cpp
index ea697de21..782310586 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-simple-functions.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-simple-functions.cpp
@@ -54,7 +54,7 @@ int test4(int test4_a, int test4_b) {
   val2 = val1;
   val2 += val1;
 
-  for (unsigned i=0; i != num_iterations; ++i) {
+  for (unsigned i = 0; i != num_iterations; ++i) {
     val1--;
     val2 += i;
     if (val2 % 2 == 0)
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-struct-and-methods.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-struct-and-methods.cpp
index 7db614357..e7af16a3f 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-struct-and-methods.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-struct-and-methods.cpp
@@ -67,18 +67,18 @@ public:
   __attribute__((optnone))
   A() {
     __builtin_memset(this, 0xFF, sizeof(*this));
-  } //!dex_label break_0
+  } //! dex_label break_0
 
   __attribute__((optnone))
   ~A() {
     *getOtherData()->a.long_ptr = 0xADDF00DL;
-  } //!dex_label break_1
+  } //! dex_label break_1
 
   __attribute__((optnone))
   long getData() {
     setSomeData1(B_VALUE, A_VALUE);
     setOtherData();
-    return getOtherData()->a.long_ptr[1]; //!dex_label break_2
+    return getOtherData()->a.long_ptr[1]; //! dex_label break_2
   }
 };
 
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp
index 43cda71a5..19045af23 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp
@@ -32,7 +32,6 @@ T test1(T x, T y) {
   return tmp; // !dex_label break_1
 }
 
-
 template<typename T>
 __attribute__((optnone))
 T test2(T x, T y) {
@@ -53,15 +52,17 @@ T test3(T InVec) {
   T result;
   for (unsigned i=0; i != TypeTraits<T>::NumElements; ++i)
     result[i] = InVec[i]; // !dex_label break_6
-  return result; // !dex_label break_7
+  return result;          // !dex_label break_7
 }
 
 template<typename T>
 __attribute__((optnone))
 T test4(T x, T y) {
   for (unsigned i=0; i != TypeTraits<T>::NumElements; ++i)
-    x[i] = (x[i] > y[i])? x[i] : y[i] + TypeTraits<T>::MysteryNumber; // !dex_label break_11
-  return x; // !dex_label break_12
+    x[i] = (x[i] > y[i])
+               ? x[i]
+               : y[i] + TypeTraits<T>::MysteryNumber; // !dex_label break_11
+  return x;                                           // !dex_label break_12
 }
 
 int main() {
@@ -83,11 +84,8 @@ int main() {
 !where {lines: !label break_0}:
   ## FIXME: gdb can print this but lldb cannot. Perhaps PR42920?
   # !value 'TypeTraits<int __attribute__((ext_vector_type(4)))>::NumElements': 4
-  # !value 'TypeTraits<int __attribute__((ext_vector_type(4)))>::UnusedField': 0xdeadbeef
-  !value 'x[0]': 1
-  !value 'x[1]': 2
-  !value 'x[2]': 3
-  !value 'x[3]': 4
+  # !value 'TypeTraits<int __attribute__((ext_vector_type(4)))>::UnusedField':
+0xdeadbeef !value 'x[0]': 1 !value 'x[1]': 2 !value 'x[2]': 3 !value 'x[3]': 4
   !value 'y[0]': 5
   !value 'y[1]': 6
   !value 'y[2]': 7
@@ -139,12 +137,10 @@ int main() {
   !value 'result[2]': 191
   !value 'result[3]': 248
 !where {lines: !range [!label break_11, !label break_12]}:
-  ## FIXME: lldb won't print this but gdb unexpectedly says it's optimized out, even at O0.
-  # !value 'TypeTraits<int __attribute__((ext_vector_type(4)))>::MysteryNumber': 3
-  !and {lines: !label break_11}:
-    !value 'i': [0, 1, 2, 3]
-  !value 'x[0]': [1, 8]
-  !value 'x[1]': [2, 9]
+  ## FIXME: lldb won't print this but gdb unexpectedly says it's optimized out,
+even at O0. # !value 'TypeTraits<int
+__attribute__((ext_vector_type(4)))>::MysteryNumber': 3 !and {lines: !label
+break_11}: !value 'i': [0, 1, 2, 3] !value 'x[0]': [1, 8] !value 'x[1]': [2, 9]
   !value 'x[2]': [3, 10]
   !value 'x[3]': [4, 11]
   !value 'y[0]': 5
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp
index 3968b1831..f3d7aeac1 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp
@@ -1,7 +1,8 @@
 // REQUIRES: system-windows
 //
 // RUN: %clang_cl /Z7 /Zi %s -o %t
-// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
+// RUN: %dexter --use-heuristic --fail-lt 1.0 -w --binary %t --debugger 'dbgeng'
+// -- %s
 
 // From https://llvm.org/pr38857, where we had issues with stack realignment.
 
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/stack-var.c b/cross-project-tests/debuginfo-tests/dexter-tests/stack-var.c
index 1e7941254..cbe82a759 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/stack-var.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/stack-var.c
@@ -8,7 +8,7 @@ void __attribute__((noinline, optnone)) bar(int *test) {}
 int main() {
   int test;
   test = 23;
-  bar(&test); // !dex_label before_bar
+  bar(&test);  // !dex_label before_bar
   return test; // !dex_label after_bar
 }
 
@@ -23,4 +23,3 @@ int main() {
   !value test: 23
 ...
 */
-
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/vla.c b/cross-project-tests/debuginfo-tests/dexter-tests/vla.c
index b86aa7971..60ae0b02d 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/vla.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/vla.c
@@ -29,5 +29,3 @@ int main(int argc, const char **argv) {
     "[1]": 22
 ...
 */
-
-
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex-continue.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex-continue.cpp
index cb3f85b4e..9571d0be8 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex-continue.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex-continue.cpp
@@ -9,7 +9,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic -v --binary %t -- %s 2>&1 | FileCheck %s
+// RUN: %dexter_regression_test_run --use-heuristic -v --binary %t -- %s 2>&1 |
+// FileCheck %s
 
 int g = 0;
 int c(int) {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex_step_function.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex_step_function.cpp
index cefe1e52f..1dca988d6 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex_step_function.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/control/dex_step_function.cpp
@@ -5,7 +5,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic -v --binary %t -- %s 2>&1 | FileCheck %s
+// RUN: %dexter_regression_test_run --use-heuristic -v --binary %t -- %s 2>&1 |
+// FileCheck %s
 
 int g = 0;
 int c(int) {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/dex_declare_file.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/dex_declare_file.cpp
index 68dc24200..931335e2d 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/dex_declare_file.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/dex_declare_file.cpp
@@ -6,8 +6,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: dex_declare_file.cpp
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: dex_declare_file.cpp
 
 int main() {
   int result = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
index 93b3b0f66..cdd77959b 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_program_state.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_program_state.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_program_state.cpp:
 
 int GCD(int lhs, int rhs)
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
index 1fdb79823..317cd7469 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_kinds.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_step_kinds.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_step_kinds.cpp:
 
 int abs(int i){
     return i < 0? i * -1: i;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
index 2fd42a9cf..4ac4a5692 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_step_order.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_step_order.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_step_order.cpp:
 
 int main()
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
index 0ee9cb38d..0389e0369 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_type.cpp
@@ -10,8 +10,8 @@
 // expected behaviour.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_watch_type.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_watch_type.cpp:
 
 template<class T>
 class Doubled {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
index fff2941a1..33103fdd5 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/expect_watch_value.cpp
@@ -6,8 +6,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_watch_value.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_watch_value.cpp:
 
 int main()
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_out_range.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_out_range.cpp
index f1fa31ada..8f3b62a0d 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_out_range.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_out_range.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: float_range_out_range.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: float_range_out_range.cpp:
 
 int main() {
   float a = 1.0f;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_zero_nonmatch.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_zero_nonmatch.cpp
index fe2eb0839..827599f6c 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_zero_nonmatch.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/float_range_zero_nonmatch.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: float_range_zero_nonmatch.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: float_range_zero_nonmatch.cpp:
 
 int main() {
   float a = 1.0f;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/missing_dex_address.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/missing_dex_address.cpp
index 1373ffb0a..b68505229 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/missing_dex_address.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/missing_dex_address.cpp
@@ -6,8 +6,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: missing_dex_address.cpp
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: missing_dex_address.cpp
 
 int main() {
     int *x = nullptr;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
index 4cc047fb7..ad10f975f 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable.cpp
@@ -6,8 +6,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unreachable.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unreachable.cpp:
 
 int
 main()
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_line_range.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_line_range.cpp
index 9e36f95c0..a54162586 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_line_range.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_line_range.cpp
@@ -6,8 +6,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unreachable_line_range.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unreachable_line_range.cpp:
 
 int
 main()
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_on_line.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_on_line.cpp
index 86c1b36c0..fe9d7e207 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_on_line.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/penalty/unreachable_on_line.cpp
@@ -6,8 +6,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unreachable_on_line.cpp:
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unreachable_on_line.cpp:
 
 int
 main()
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/command_line.c b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/command_line.c
index 5b19a5a82..9059d6d7a 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/command_line.c
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/command_line.c
@@ -2,8 +2,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_c_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: command_line.c:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: command_line.c:
 
 int main(int argc, const char **argv) {
   if (argc == 4)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_after_ref.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_after_ref.cpp
index f4a14836e..a515fbe63 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_after_ref.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_after_ref.cpp
@@ -3,8 +3,8 @@
 //      the first reference to that value.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: address_after_ref.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: address_after_ref.cpp
 
 int main() {
     int *x = new int(5);
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_hit_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_hit_count.cpp
index 1695485c6..f9b0abdee 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_hit_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/address_hit_count.cpp
@@ -5,8 +5,8 @@
 //      times.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: address_hit_count.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: address_hit_count.cpp
 
 int main() {
     int *x = new int[3];
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 89286eb89..d22a5bcfd 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
@@ -3,8 +3,8 @@
 //      addresses of two local variables that refer to the same address.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expression_address.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expression_address.cpp
 
 int main() {
     int x = 5;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/identical_address.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/identical_address.cpp
index 5851976d9..4c27d5611 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/identical_address.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/identical_address.cpp
@@ -3,8 +3,8 @@
 //      pointer variables.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: identical_address.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: identical_address.cpp
 
 int main() {
     int *x = new int(5);
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/multiple_address.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/multiple_address.cpp
index ada450cec..9d75e6ad8 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/multiple_address.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/multiple_address.cpp
@@ -3,8 +3,8 @@
 //      addresses can be used within a single \DexExpectWatchValue.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: multiple_address.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: multiple_address.cpp
 
 int main() {
     int *x = new int(5);
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/offset_address.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/offset_address.cpp
index cbe8e43a7..4bac32bd2 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/offset_address.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/offset_address.cpp
@@ -3,8 +3,8 @@
 //      variables that have a fixed offset between them.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: offset_address.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: offset_address.cpp
 
 int main() {
     int *x = new int[5];
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/self_comparison.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/self_comparison.cpp
index c054f0a0a..00b988b56 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/self_comparison.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_address/self_comparison.cpp
@@ -3,8 +3,8 @@
 //      value of a variable over time, relative to its initial value.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: self_comparison.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: self_comparison.cpp
 
 int main() {
     int *x = new int[3];
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/dex_and_source/test.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/dex_and_source/test.cpp
index 6be387c42..5bc9cf62e 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/dex_and_source/test.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/dex_and_source/test.cpp
@@ -7,8 +7,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: dex_and_source
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: dex_and_source
 
 int main() {
   int result = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional.cpp
index 4bbc27e3f..01081c986 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional.cpp
@@ -7,8 +7,8 @@
 //      Tests using the default controller (no \DexLimitSteps).
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: default_conditional.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: default_conditional.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional_hit_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional_hit_count.cpp
index 154db536a..fb675d7b8 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional_hit_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_conditional_hit_count.cpp
@@ -8,8 +8,8 @@
 //      Tests using the default controller (no \DexLimitSteps).
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: default_conditional_hit_count.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: default_conditional_hit_count.cpp
 
 int main() {
     for (int y = 0; y < 4; ++y)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_hit_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_hit_count.cpp
index a81a11dd3..124b43ed2 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_hit_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_hit_count.cpp
@@ -5,8 +5,8 @@
 //      Tests using the default controller (no \DexLimitSteps).
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: default_hit_count.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: default_hit_count.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_simple.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_simple.cpp
index cfa4237cd..51c946b56 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_simple.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/default_simple.cpp
@@ -1,12 +1,12 @@
 // Purpose:
 //      Test that \DexFinishTest can be used without a condition or hit_count,
-//      so the test simply exits as soon as the line referenced by \DexFinishTest
-//      is stepped on.
-//      Tests using the default controller (no \DexLimitSteps).
+//      so the test simply exits as soon as the line referenced by
+//      \DexFinishTest is stepped on. Tests using the default controller (no
+//      \DexLimitSteps).
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: default_simple.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: default_simple.cpp
 
 int main() {
     int x = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional.cpp
index 0b5044f50..7e079ea46 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional.cpp
@@ -8,8 +8,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_conditional.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_conditional.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional_hit_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional_hit_count.cpp
index 37a3904c2..9a5c83ef0 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional_hit_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_conditional_hit_count.cpp
@@ -9,8 +9,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_conditional_hit_count.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_conditional_hit_count.cpp
 
 int main() {
     for (int y = 0; y < 4; ++y)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_hit_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_hit_count.cpp
index 2dd49872e..015bdf869 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_hit_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_finish_test/limit_steps_hit_count.cpp
@@ -8,8 +8,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_hit_count.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_hit_count.cpp
 
 int main() {
     for (int x = 0; x < 10; ++x)
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 b140c8eac..83e7a930c 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
@@ -1,15 +1,15 @@
 // Purpose:
 //      Test that \DexFinishTest can be used without a condition or hit_count,
-//      so the test simply exits as soon as the line referenced by \DexFinishTest
-//      is stepped on.
-//      Test using the conditional controller (using \DexLimitSteps).
+//      so the test simply exits as soon as the line referenced by
+//      \DexFinishTest is stepped on. Test using the conditional controller
+//      (using \DexLimitSteps).
 //
 // The dbgeng driver doesn't support \DexLimitSteps yet.
 // UNSUPPORTED: system-windows, system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_simple.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_simple.cpp
 
 int main() {
     int x = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
index 284e62408..accb87c25 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_program_state.cpp
@@ -6,8 +6,8 @@
 //
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_program_state.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_program_state.cpp:
 
 int GCD(int lhs, int rhs)
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
index 6945a3d37..9615f20f7 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/direction.cpp
@@ -14,8 +14,8 @@
 // UNSUPPORTED: system-linux
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: direction.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: direction.cpp:
 
 int func(int i) {
     return i; // step 7, 9, 11
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
index 0394dbc3c..4b4c9be73 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func.cpp
@@ -6,8 +6,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: func.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: func.cpp:
 
 int func(int i) {
     return i;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
index 0068baca4..ffdc60c7b 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/func_external.cpp
@@ -9,8 +9,8 @@
 // why.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: func_external.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: func_external.cpp:
 
 #include <cstdlib>
 
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
index fbc9a3b60..f60bb156a 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/recursive.cpp
@@ -6,8 +6,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: recursive.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: recursive.cpp:
 
 int func(int i) {
     if (i > 1)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
index 25f64ce08..7249f0f7e 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_kind/small_loop.cpp
@@ -6,8 +6,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: small_loop.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: small_loop.cpp:
 
 int func(int i){
     return i;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
index 6ff1428a6..7d30b0a5b 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_step_order.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_step_order.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_step_order.cpp:
 
 int main() // DexLabel('main')
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
index 785306791..673fc2206 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_type.cpp
@@ -4,13 +4,12 @@
 //
 // UNSUPPORTED: system-darwin
 //
-// TODO: On Windows WITH dbgeng, This test takes a long time to run and doesn't evaluate type values
-// in the same manner as LLDB.
-// XFAIL: system-windows
+// TODO: On Windows WITH dbgeng, This test takes a long time to run and doesn't
+// evaluate type values in the same manner as LLDB. XFAIL: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_watch_type.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_watch_type.cpp:
 
 template<class T>
 class Doubled {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
index 0cd8549bb..f3a6ab6f7 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/expect_watch_value.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: expect_watch_value.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: expect_watch_value.cpp:
 
 unsigned long Factorial(int n) {
     volatile unsigned long fac = 1; // DexLabel('entry')
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_multiple.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_multiple.cpp
index 617510d01..1dd79a0d8 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_multiple.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_multiple.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: float_range_multiple.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: float_range_multiple.cpp:
 
 int main() {
   float a = 1.0f;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_no_arg.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_no_arg.cpp
index caa6e5996..cb678462b 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_no_arg.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_no_arg.cpp
@@ -8,8 +8,8 @@
 // UNSUPPORTED: system-darwin, system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: float_range_no_arg.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: float_range_no_arg.cpp:
 
 int main() {
   float a = 1.0f;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_small.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_small.cpp
index 9b00e55f0..0c33accd9 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_small.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_small.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: float_range_small.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: float_range_small.cpp:
 
 int main() {
   float a = 1.0f;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_zero_match.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_zero_match.cpp
index 757972561..32dd556e1 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_zero_match.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/float_range_watch/float_range_zero_match.cpp
@@ -4,8 +4,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: float_range_zero_match.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: float_range_zero_match.cpp:
 
 int main() {
   float a = 1.0f;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/hit_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/hit_count.cpp
index 56262e12b..b5e70eeb4 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/hit_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/hit_count.cpp
@@ -3,8 +3,8 @@
 //      the number of times the command can trigger.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: hit_count.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: hit_count.cpp
 
 int a;
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_check_json_step_count.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_check_json_step_count.cpp
index 62640fee6..8b5d7ba75 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_check_json_step_count.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_check_json_step_count.cpp
@@ -2,10 +2,9 @@
 //      Check number of step lines are correctly reported in json output.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t --verbose -- %s | FileCheck %s
-// CHECK: limit_steps_check_json_step_count.cpp
-// CHECK: ## BEGIN ##
-// CHECK-COUNT-3: json_step_count.cpp",
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t --verbose -- %s
+// | FileCheck %s CHECK: limit_steps_check_json_step_count.cpp CHECK: ## BEGIN
+// ## CHECK-COUNT-3: json_step_count.cpp",
 
 int main() {
   int result = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_loop.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_loop.cpp
index c8c61a8df..26352b859 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_loop.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_loop.cpp
@@ -3,8 +3,8 @@
 //      for loop.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_expect_loop.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_expect_loop.cpp:
 
 int main(const int argc, const char * argv[]) {
   unsigned int sum = 1;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_value.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_value.cpp
index cc6a3ca01..b29d64a25 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_value.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_expect_value.cpp
@@ -2,8 +2,8 @@
 //      Ensure that limited stepping breaks for all expected values.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_expect_value.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_expect_value.cpp
 
 int main() {
   int i = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_line_mismatch.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_line_mismatch.cpp
index c91c05e24..1be8bf976 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_line_mismatch.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_line_mismatch.cpp
@@ -4,8 +4,8 @@
 //      empty line.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_line_mismatch.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_line_mismatch.cpp
 
 int main() {
   int i = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_overlapping_ranges.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_overlapping_ranges.cpp
index f6ffc8e11..cd9bb6d07 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_overlapping_ranges.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_overlapping_ranges.cpp
@@ -2,8 +2,8 @@
 //      Ensure that multiple overlapping \DexLimitSteps ranges do not interfere.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_overlapping_ranges.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_overlapping_ranges.cpp
 
 int main() {
   int val1;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_same_line_conditional.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_same_line_conditional.cpp
index 147018418..11c14b776 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_same_line_conditional.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/limit_steps_same_line_conditional.cpp
@@ -2,8 +2,8 @@
 //      Test that LimitStep commands can exist on the same from line.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: limit_steps_same_line_conditional.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: limit_steps_same_line_conditional.cpp
 
 int main() {
   int val1 = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/unconditional.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/unconditional.cpp
index 1743e5280..aba0c3968 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/unconditional.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/limit_steps/unconditional.cpp
@@ -3,8 +3,8 @@
 //      breakpoint range is set any time from_line is stepped on).
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unconditional.cpp
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unconditional.cpp
 
 int glob;
 int main() {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
index f02c12a8b..307b53ab0 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unreachable.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unreachable.cpp:
 
 int main()
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_not_cmd_lineno.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_not_cmd_lineno.cpp
index 2930c1030..2b3044703 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_not_cmd_lineno.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_not_cmd_lineno.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unreachable_not_cmd_lineno.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unreachable_not_cmd_lineno.cpp:
 
 int main(int argc, char **argv)
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_on_line.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_on_line.cpp
index 69129d044..3bd2c4771 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_on_line.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/unreachable_on_line.cpp
@@ -5,8 +5,8 @@
 // UNSUPPORTED: system-darwin
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: unreachable_on_line.cpp:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: unreachable_on_line.cpp:
 
 int main()
 {
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_function.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_function.cpp
index 9c9ea3cca..5cc108067 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_function.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_function.cpp
@@ -1,5 +1,6 @@
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --skip-evaluate --binary %t -- %s | FileCheck %s
+// RUN: %dexter_regression_test_run --skip-evaluate --binary %t -- %s |
+// FileCheck %s
 
 void assign(int *Target, int Value) {
     // A comment.
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_line.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_line.cpp
index cc0e79113..6441f9271 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_line.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/simple_where_line.cpp
@@ -1,5 +1,6 @@
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --skip-evaluate --binary %t -- %s | FileCheck %s
+// RUN: %dexter_regression_test_run --skip-evaluate --binary %t -- %s |
+// FileCheck %s
 
 /// Test that we can perform a simple non-nested line-based !where.
 
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_file_paths.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_file_paths.cpp
index a09975721..8a62722b4 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_file_paths.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/scripts/debugging/where_file_paths.cpp
@@ -1,5 +1,6 @@
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --skip-evaluate --binary %t -- %s | FileCheck %s --implicit-check-not="header.h(9"
+// RUN: %dexter_regression_test_run --skip-evaluate --binary %t -- %s |
+// FileCheck %s --implicit-check-not="header.h(9"
 
 /// Test that we can use file paths as part of a !where node, and that we can
 /// use a trailing subset of the file path, including just the base filename, to
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/address_printing.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/address_printing.cpp
index b12ed4c14..457cc3a40 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/address_printing.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/address_printing.cpp
@@ -12,7 +12,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s | FileCheck %s
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s |
+// FileCheck %s
 
 // CHECK: Resolved Addresses:
 // CHECK-NEXT: 'x_2': 0x[[X2_VAL:[0-9a-f]+]]
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_bad_label_ref.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_bad_label_ref.cpp
index 03eb41cff..0da5db304 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_bad_label_ref.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_bad_label_ref.cpp
@@ -2,10 +2,12 @@
 //      Check that referencing an undefined label gives a useful error message.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s | FileCheck %s --match-full-lines
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s |
+// FileCheck %s --match-full-lines
 //
-// CHECK: parser error:{{.*}}err_bad_label_ref.cpp(15): Unresolved label: 'label_does_not_exist'
-// CHECK-NEXT: {{Dex}}ExpectWatchValue('result', '0', on_line=ref('label_does_not_exist'))
+// CHECK: parser error:{{.*}}err_bad_label_ref.cpp(15): Unresolved label:
+// 'label_does_not_exist' CHECK-NEXT: {{Dex}}ExpectWatchValue('result', '0',
+// on_line=ref('label_does_not_exist'))
 
 int main() {
     int result = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_address.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_address.cpp
index 962a06557..447fffdbf 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_address.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_address.cpp
@@ -2,8 +2,8 @@
 //      Check that declaring duplicate addresses gives a useful error message.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s | FileCheck %s --match-full-lines
-
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s |
+// FileCheck %s --match-full-lines
 
 int main() {
     int *result = new int(0);
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_label.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_label.cpp
index e6601cac7..1a9678b5d 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_label.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_duplicate_label.cpp
@@ -2,10 +2,11 @@
 //      Check that defining duplicate labels gives a useful error message.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s | FileCheck %s --match-full-lines
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s |
+// FileCheck %s --match-full-lines
 //
-// CHECK: parser error:{{.*}}err_duplicate_label.cpp(12): Found duplicate line label: 'oops'
-// CHECK-NEXT: {{Dex}}Label('oops')
+// CHECK: parser error:{{.*}}err_duplicate_label.cpp(12): Found duplicate line
+// label: 'oops' CHECK-NEXT: {{Dex}}Label('oops')
 
 int main() {
     int result = 0; // DexLabel('oops')
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 0e6bba795..636766612 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 --use-heuristic --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 --use-heuristic --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 0e6963d3d..3265cee80 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 --use-heuristic --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 --use-heuristic --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 c5e8db6bb..55473b3fd 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
@@ -5,12 +5,12 @@
 //      commands.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args \
-// RUN:     -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --use-heuristic --binary %t
+// %dexter_regression_test_debugger_args \ RUN:     -v -- %s | FileCheck %s
+// --match-full-lines --strict-whitespace
 //
-// CHECK:parser error:{{.*}}err_paren.cpp(19): Unbalanced parenthesis starting here
-// CHECK:// {{Dex}}ExpectWatchValue(
-// CHECK:                      ^
+// CHECK:parser error:{{.*}}err_paren.cpp(19): 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 af8c5b902..708c6cd81 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
@@ -5,12 +5,12 @@
 //      commands.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args \
-// RUN:     -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --use-heuristic --binary %t
+// %dexter_regression_test_debugger_args \ RUN:     -v -- %s | FileCheck %s
+// --match-full-lines --strict-whitespace
 //
-// CHECK:parser error:{{.*}}err_paren_mline.cpp(20): Unbalanced parenthesis starting here
-// CHECK:{{Dex}}ExpectWatchValue(
-// CHECK:                   ^
+// CHECK:parser error:{{.*}}err_paren_mline.cpp(20): 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 c535809b8..ec5a9787b 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
@@ -5,8 +5,9 @@
 //      commands.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args \
-// RUN:     -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --use-heuristic --binary %t
+// %dexter_regression_test_debugger_args \ RUN:     -v -- %s | FileCheck %s
+// --match-full-lines --strict-whitespace
 //
 // CHECK:parser error:{{.*}}err_syntax.cpp(18): 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 226e54c6e..832404d29 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,9 @@
 //      they appeared in rather than the current declared file.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args -v -- %s \
-// RUN:     | FileCheck %s --implicit-check-not=FAIL-FILENAME-MATCH
+// RUN: not %dexter_base test --use-heuristic --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 508d8746e..a1614da0d 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
@@ -5,8 +5,9 @@
 //      commands.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args \
-// RUN:     -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --use-heuristic --binary %t
+// %dexter_regression_test_debugger_args \ RUN:     -v -- %s | FileCheck %s
+// --match-full-lines --strict-whitespace
 //
 // CHECK:parser error:{{.*}}err_syntax_mline.cpp(21): 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 c4ee0e09f..cf0e56999 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
@@ -5,8 +5,9 @@
 //      commands.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args \
-// RUN:     -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --use-heuristic --binary %t
+// %dexter_regression_test_debugger_args \ RUN:     -v -- %s | FileCheck %s
+// --match-full-lines --strict-whitespace
 //
 // CHECK:parser error:{{.*}}err_type.cpp(18): 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 ef18e8c0b..bf28dec37 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
@@ -5,8 +5,9 @@
 //      commands.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_base test --use-heuristic --binary %t %dexter_regression_test_debugger_args \
-// RUN:     -v -- %s | FileCheck %s --match-full-lines --strict-whitespace
+// RUN: not %dexter_base test --use-heuristic --binary %t
+// %dexter_regression_test_debugger_args \ RUN:     -v -- %s | FileCheck %s
+// --match-full-lines --strict-whitespace
 //
 // CHECK:parser error:{{.*}}err_type_mline.cpp(19): expected at least two args
 // CHECK:{{Dex}}ExpectWatchValue(
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_undeclared_addr.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_undeclared_addr.cpp
index 7b974ce41..dbe7adcf5 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_undeclared_addr.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_undeclared_addr.cpp
@@ -2,8 +2,8 @@
 //      Check that using an undeclared address gives a useful error message.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s | FileCheck %s --match-full-lines
-
+// RUN: not %dexter_regression_test_run --use-heuristic --binary %t -v -- %s |
+// FileCheck %s --match-full-lines
 
 int main() {
     int *result = new int(0);
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_another_line.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_another_line.cpp
index 690456821..af8596eb6 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_another_line.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_another_line.cpp
@@ -3,8 +3,8 @@
 //    that line instead of the line the command is found on.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s | FileCheck %s
-// CHECK: label_another_line.cpp: (1.0000)
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -- %s |
+// FileCheck %s CHECK: label_another_line.cpp: (1.0000)
 
 int main() {
   int result = 0;
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_offset.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_offset.cpp
index dee543daf..64548a7d1 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_offset.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/label_offset.cpp
@@ -2,7 +2,8 @@
 //      Check that we can use label-relative line numbers.
 //
 // RUN: %dexter_regression_test_cxx_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t -v -- %s | FileCheck %s
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t -v -- %s |
+// FileCheck %s
 //
 // CHECK: label_offset.cpp: (1.0000)
 
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args.c b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args.c
index 2eb4bcdae..b0d955081 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args.c
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args.c
@@ -2,8 +2,8 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_c_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t --target-run-args "a b 'c d'" -- %s | FileCheck %s
-// CHECK: target_run_args.c:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t
+// --target-run-args "a b 'c d'" -- %s | FileCheck %s CHECK: target_run_args.c:
 
 int main(int argc, const char **argv) {
   if (argc == 4)
diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args_with_command.c b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args_with_command.c
index a226f61ab..19b9ff348 100644
--- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args_with_command.c
+++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/target_run_args_with_command.c
@@ -2,8 +2,9 @@
 // UNSUPPORTED: system-windows
 //
 // RUN: %dexter_regression_test_c_build %s -o %t
-// RUN: %dexter_regression_test_run --use-heuristic --binary %t --target-run-args "a b 'c d'" -- %s | FileCheck %s
-// CHECK: target_run_args_with_command.c:
+// RUN: %dexter_regression_test_run --use-heuristic --binary %t
+// --target-run-args "a b 'c d'" -- %s | FileCheck %s CHECK:
+// target_run_args_with_command.c:
 
 int main(int argc, const char **argv) {
   if (argc == 6)

``````````

</details>


https://github.com/llvm/llvm-project/pull/204367
