From 446eccb409c5528bbef72ca179b2878b9413ac59 Mon Sep 17 00:00:00 2001 From: Orlando Cazalet-Hyams Date: Tue, 9 Sep 2025 15:09:54 +0100 Subject: [PATCH] Revert "[Dexter] Temporarily print DAP logs on specific exception (#157130)" This reverts commit 5341e267fb254ae8c3968c4b7bc7fec43e8f5a74. --- .../debuginfo-tests/dexter/dex/debugger/DAP.py | 4 ---- .../dexter/dex/debugger/lldb/LLDB.py | 13 +++---------- .../feature_tests/commands/control/dex-continue.cpp | 2 +- .../commands/control/dex_step_function.cpp | 2 +- .../commands/penalty/dex_declare_file.cpp | 2 +- .../commands/penalty/expect_program_state.cpp | 2 +- .../commands/penalty/expect_step_kinds.cpp | 2 +- .../commands/penalty/expect_step_order.cpp | 2 +- .../commands/penalty/expect_watch_type.cpp | 2 +- .../commands/penalty/expect_watch_value.cpp | 2 +- .../commands/penalty/float_range_out_range.cpp | 2 +- .../commands/penalty/float_range_zero_nonmatch.cpp | 2 +- .../commands/penalty/missing_dex_address.cpp | 2 +- .../feature_tests/commands/penalty/unreachable.cpp | 2 +- .../commands/penalty/unreachable_line_range.cpp | 2 +- .../commands/penalty/unreachable_on_line.cpp | 2 +- .../feature_tests/commands/perfect/command_line.c | 2 +- .../dex_declare_address/address_after_ref.cpp | 2 +- .../dex_declare_address/address_hit_count.cpp | 2 +- .../dex_declare_address/expression_address.cpp | 2 +- .../dex_declare_address/identical_address.cpp | 2 +- .../dex_declare_address/multiple_address.cpp | 2 +- .../perfect/dex_declare_address/offset_address.cpp | 2 +- .../perfect/dex_declare_address/self_comparison.cpp | 2 +- .../dex_declare_file/dex_and_source/test.cpp | 2 +- .../precompiled_binary/commands.dex | 2 +- .../dex_commands/commands.dex | 2 +- .../dex_commands/source_root_dir.dex | 2 +- .../windows_noncanonical_path/test.dex | 2 +- .../perfect/dex_finish_test/default_conditional.cpp | 2 +- .../default_conditional_hit_count.cpp | 2 +- .../perfect/dex_finish_test/default_hit_count.cpp | 2 +- .../perfect/dex_finish_test/default_simple.cpp | 2 +- .../dex_finish_test/limit_steps_conditional.cpp | 2 +- .../limit_steps_conditional_hit_count.cpp | 2 +- .../dex_finish_test/limit_steps_hit_count.cpp | 2 +- .../perfect/dex_finish_test/limit_steps_simple.cpp | 2 +- .../commands/perfect/expect_program_state.cpp | 2 +- .../commands/perfect/expect_step_kind/direction.cpp | 2 +- .../commands/perfect/expect_step_kind/func.cpp | 2 +- .../perfect/expect_step_kind/func_external.cpp | 2 +- .../commands/perfect/expect_step_kind/recursive.cpp | 2 +- .../perfect/expect_step_kind/small_loop.cpp | 2 +- .../commands/perfect/expect_step_order.cpp | 2 +- .../commands/perfect/expect_watch_type.cpp | 2 +- .../commands/perfect/expect_watch_value.cpp | 2 +- .../float_range_watch/float_range_multiple.cpp | 2 +- .../float_range_watch/float_range_no_arg.cpp | 2 +- .../perfect/float_range_watch/float_range_small.cpp | 2 +- .../float_range_watch/float_range_zero_match.cpp | 2 +- .../commands/perfect/limit_steps/hit_count.cpp | 2 +- .../limit_steps_check_json_step_count.cpp | 2 +- .../perfect/limit_steps/limit_steps_expect_loop.cpp | 2 +- .../limit_steps/limit_steps_expect_value.cpp | 2 +- .../limit_steps/limit_steps_line_mismatch.cpp | 2 +- .../limit_steps/limit_steps_overlapping_ranges.cpp | 2 +- .../limit_steps_same_line_conditional.cpp | 2 +- .../commands/perfect/limit_steps/unconditional.cpp | 2 +- .../feature_tests/commands/perfect/unreachable.cpp | 2 +- .../commands/perfect/unreachable_not_cmd_lineno.cpp | 2 +- .../commands/perfect/unreachable_on_line.cpp | 2 +- .../dexter/feature_tests/subtools/help/help.test | 2 +- .../subtools/list-debuggers/list-debuggers.test | 2 +- .../subtools/test/address_printing.cpp | 2 +- .../subtools/test/err_bad_label_ref.cpp | 2 +- .../subtools/test/err_duplicate_address.cpp | 2 +- .../subtools/test/err_duplicate_label.cpp | 2 +- .../feature_tests/subtools/test/err_label_kwarg.cpp | 2 +- .../subtools/test/err_limit_steps_no_values.cpp | 2 +- .../feature_tests/subtools/test/err_paren.cpp | 2 +- .../feature_tests/subtools/test/err_paren_mline.cpp | 2 +- .../feature_tests/subtools/test/err_syntax.cpp | 2 +- .../subtools/test/err_syntax_dexdeclarefile.cpp | 2 +- .../subtools/test/err_syntax_mline.cpp | 2 +- .../dexter/feature_tests/subtools/test/err_type.cpp | 2 +- .../feature_tests/subtools/test/err_type_mline.cpp | 2 +- .../subtools/test/err_undeclared_addr.cpp | 2 +- .../subtools/test/label_another_line.cpp | 2 +- .../feature_tests/subtools/test/label_offset.cpp | 2 +- .../feature_tests/subtools/test/target_run_args.c | 2 +- .../subtools/test/target_run_args_with_command.c | 2 +- .../dexter/feature_tests/subtools/view.cpp | 2 +- 82 files changed, 83 insertions(+), 94 deletions(-) diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py index 6f94ff34e6b21..4e64f880487f5 100644 --- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py +++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py @@ -10,7 +10,6 @@ import abc from collections import defaultdict import copy -import io import json import os import shlex @@ -51,7 +50,6 @@ def __init__(self, context): self.prefix_recv: str = "<-" self.out_handle = None self.open = False - self.text = io.StringIO() # In-process copy of the message log. self.lock = threading.Lock() def _custom_enter(self): @@ -93,8 +91,6 @@ def write_message(self, message: dict, incoming: bool): message_str = json.dumps( self._colorize_dap_message(message), indent=self.indent ).replace("\\u001b", "\033") - - self.text.write(f"{prefix} {message_str}\n") if self.out_handle is not None and self.open: with self.lock: self.out_handle.write(f"{prefix} {message_str}\n") diff --git a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py index 9ed9f5fd1c394..fa10b4914d45c 100644 --- a/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py +++ b/cross-project-tests/debuginfo-tests/dexter/dex/debugger/lldb/LLDB.py @@ -430,16 +430,9 @@ def _post_step_hook(self): trace_response = self._await_response(trace_req_id) if not trace_response["success"]: raise DebuggerException("failed to get stack frames") - try: - stackframes = trace_response["body"]["stackFrames"] - path = stackframes[0]["source"]["path"] - addr = stackframes[0]["instructionPointerReference"] - except KeyError as e: - # Temporarily print the DAP log if this fails to aid debugging - # a buildbot failure that doesn't reproduce easily. - print(self.message_logger.text.getvalue(), file=sys.stderr) - raise e - + stackframes = trace_response["body"]["stackFrames"] + path = stackframes[0]["source"]["path"] + addr = stackframes[0]["instructionPointerReference"] if any( self._debugger_state.bp_addr_map.get(self.dex_id_to_dap_id[dex_bp_id]) == addr 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 851147f0218aa..2d5cbe04569d5 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,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run -v --binary %t -- %s 2>&1 | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run -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 c0c08fb1490a5..900e10b64a96e 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,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run -v --binary %t -- %s 2>&1 | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run -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 6c0b154144649..4ee8effda39e4 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,7 +6,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: dex_declare_file.cpp int main() { 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 7f3a9edccf2a1..934b4e978073f 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --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 47c27443352ac..b059c993ba8bf 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: expect_step_kinds.cpp: int abs(int 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 e1d133b4d76a0..391153ba18291 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --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 288fd5d9caf34..507f821cfd08c 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,7 +10,7 @@ // expected behaviour. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: expect_watch_type.cpp: template 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 81af19a17d44c..4cd2b390623c1 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,7 +6,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --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 eea6d06b55282..466dff34efc6f 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: float_range_out_range.cpp: int main() { 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 cddce7973e0b6..e4f9e116d93fd 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: float_range_zero_nonmatch.cpp: int main() { 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 2dfa2fdad5c89..c5803dd11d134 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,7 +6,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: missing_dex_address.cpp int main() { 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 86c59ec809d90..ddccf68caf9e4 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,7 +6,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: unreachable.cpp: int 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 05480ef77dce6..b6925eb4e6c20 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,7 +6,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: unreachable_line_range.cpp: int 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 e16805f6dee34..ba741a48850b7 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,7 +6,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: unreachable_on_line.cpp: int 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 909eb5e2a0da9..b7f29abb86575 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,7 +2,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_c_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: command_line.c: int main(int argc, const char **argv) { 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 b22c37e95e139..67afd6687c3dc 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,7 +3,7 @@ // the first reference to that value. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: address_after_ref.cpp int main() { 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 30394f44a1eb4..9fd1b24774285 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,7 +5,7 @@ // times. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: address_hit_count.cpp int main() { 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 c8701b8b5ee1e..0f4463338bba6 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,7 +3,7 @@ // 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 --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: expression_address.cpp int main() { 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 1acfdaf30a9a0..edcda2c94a441 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,7 +3,7 @@ // pointer variables. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: identical_address.cpp int main() { 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 eee78714d45d7..66dcdb3ff42ab 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,7 +3,7 @@ // addresses can be used within a single \DexExpectWatchValue. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: multiple_address.cpp int main() { 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 72a5d3f65f877..b6e4f2cb535ad 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,7 +3,7 @@ // variables that have a fixed offset between them. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: offset_address.cpp int main() { 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 46d0757710bdd..295a05556d287 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,7 +3,7 @@ // 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 --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: self_comparison.cpp int main() { 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 09e05869fa4c3..9e720ff8aa557 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,7 +7,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: dex_and_source int main() { diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary/commands.dex b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary/commands.dex index e96072fa1115c..970106cc6fc25 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary/commands.dex +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary/commands.dex @@ -5,7 +5,7 @@ # UNSUPPORTED: system-darwin # # RUN: %dexter_regression_test_cxx_build %S/test.cpp -o %t -# RUN: %dexter_regression_base --binary %t %s | FileCheck --dump-input-context=999999999 %s +# RUN: %dexter_regression_base --binary %t %s | FileCheck %s # CHECK: commands.dex # # test.cpp diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/commands.dex b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/commands.dex index e5b7224152ea3..fffbaafd87db0 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/commands.dex +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/commands.dex @@ -5,7 +5,7 @@ # UNSUPPORTED: system-darwin # # RUN: %clang %S/../source/test.cpp -O0 -g -o %t -# RUN: %dexter_regression_base --binary %t %s | FileCheck --dump-input-context=999999999 %s +# RUN: %dexter_regression_base --binary %t %s | FileCheck %s # RUN: rm %t # CHECK: commands.dex # diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/source_root_dir.dex b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/source_root_dir.dex index 5d0cfbc26845e..e186cabfd25bb 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/source_root_dir.dex +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/precompiled_binary_different_dir/dex_commands/source_root_dir.dex @@ -6,7 +6,7 @@ # RUN: %clang %S/../source/test.cpp -O0 -g -o %t # RUN: %dexter_regression_base --binary %t \ -# RUN: --source-root-dir="%S/../source" -- %s | FileCheck --dump-input-context=999999999 %s +# RUN: --source-root-dir="%S/../source" -- %s | FileCheck %s # RUN: rm %t # CHECK: source_root_dir.dex: (1.0000) diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/windows_noncanonical_path/test.dex b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/windows_noncanonical_path/test.dex index fb747dfbdbc5d..b96562e59060a 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/windows_noncanonical_path/test.dex +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/commands/perfect/dex_declare_file/windows_noncanonical_path/test.dex @@ -4,7 +4,7 @@ # REQUIRES: system-windows # # RUN: %dexter_regression_test_cxx_build "%S/source/test file.cpp" -o %t -# RUN: %dexter_regression_base --binary %t %s | FileCheck --dump-input-context=999999999 %s +# RUN: %dexter_regression_base --binary %t %s | FileCheck %s # CHECK: test.dex # # ./source/test file.cpp 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 c44025ed09f46..f419577e2d02e 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,7 +7,7 @@ // Tests using the default controller (no \DexLimitSteps). // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: default_conditional.cpp int main() { 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 8f771729266e9..cd18523468267 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,7 +8,7 @@ // Tests using the default controller (no \DexLimitSteps). // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: default_conditional_hit_count.cpp int main() { 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 5849d6fccc299..efc22a6d7d816 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,7 +5,7 @@ // Tests using the default controller (no \DexLimitSteps). // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: default_hit_count.cpp int main() { 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 9cde122d51379..ee4cf1decf285 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 @@ -5,7 +5,7 @@ // Tests using the default controller (no \DexLimitSteps). // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: default_simple.cpp int main() { 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 6ee8d0733b120..253e984e51c4b 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,7 +8,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_conditional.cpp int main() { 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 1fb7e9402453d..ac64d49d5392d 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,7 +9,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_conditional_hit_count.cpp int main() { 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 f3375648115e4..ce9432f47bfaa 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,7 +8,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_hit_count.cpp int main() { 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 5be696d89239e..923f596ab84ed 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 @@ -8,7 +8,7 @@ // UNSUPPORTED: system-windows, system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_simple.cpp int main() { 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 af04c14981bb0..58bdf40d9e112 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,7 +6,7 @@ // // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --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 ca97307257462..c155cfcad5c3c 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 @@ -11,7 +11,7 @@ // XFAIL: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: direction.cpp: int func(int i) { 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 3a85cd86a3812..0ea8875a9e21a 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,7 +6,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: func.cpp: int func(int 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 5fd05bcdb338f..eeb1e8cf7d26c 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,7 +9,7 @@ // why. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: func_external.cpp: #include 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 2ad9a0310186c..3642c9baf7a4f 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,7 +6,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: recursive.cpp: int func(int i) { 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 492d6a45799ab..18859bd50089c 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,7 +6,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: small_loop.cpp: int func(int 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 e1a3d885cf076..22883a7ce0c66 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --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 0fd7811db8891..ddc5e7cce6e98 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 @@ -9,7 +9,7 @@ // XFAIL: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: expect_watch_type.cpp: template 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 3aaa88b384c39..593488b809959 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: expect_watch_value.cpp: unsigned long Factorial(int n) { 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 129a7d60f1b6a..0ef1724c97eb5 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: float_range_multiple.cpp: int main() { 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 1a57fc171f863..06454880b0fe9 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,7 +8,7 @@ // UNSUPPORTED: system-darwin, system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: float_range_no_arg.cpp: int main() { 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 13a2528c8a240..2e105a4ef3fbf 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: float_range_small.cpp: int main() { 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 3cdb67f92a584..3c1926fd3cede 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,7 +4,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: float_range_zero_match.cpp: int main() { 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 7cb78eb83aba1..9f91145eaa3a5 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,7 +3,7 @@ // the number of times the command can trigger. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: hit_count.cpp int a; 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 b1936b39cd26c..ce28423b0c57f 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,7 +2,7 @@ // 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 --binary %t --verbose -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t --verbose -- %s | FileCheck %s // CHECK: limit_steps_check_json_step_count.cpp // CHECK: ## BEGIN ## // CHECK-COUNT-3: json_step_count.cpp", 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 038ef3ff69ca1..15c8c87d906fb 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,7 +3,7 @@ // for loop. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_expect_loop.cpp: int main(const int argc, const char * argv[]) { 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 b9f98938d87b4..03b01cf574c1e 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,7 +2,7 @@ // Ensure that limited stepping breaks for all expected values. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_expect_value.cpp int main() { 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 a1a31e31ddeb7..8b242c4e288f6 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,7 +4,7 @@ // empty line. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_line_mismatch.cpp int main() { 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 718708f5b564f..a99f6bbbe545a 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,7 +2,7 @@ // Ensure that multiple overlapping \DexLimitSteps ranges do not interfere. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_overlapping_ranges.cpp int main() { 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 7c602a9ce7974..6613ad2355c7c 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,7 +2,7 @@ // 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 --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: limit_steps_same_line_conditional.cpp int main() { 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 e334e15dd59a3..3a145eaa400a5 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,7 +3,7 @@ // 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 --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: unconditional.cpp int glob; 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 25f43219d0454..7f42c50c1c791 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --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 b8aa8c744d1fd..58ab2e6734057 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --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 b5e5c8ea53567..f414729855177 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,7 +5,7 @@ // UNSUPPORTED: system-darwin // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: unreachable_on_line.cpp: int main() diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/help/help.test b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/help/help.test index 50fff9f2b3049..90119a1d74db7 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/help/help.test +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/help/help.test @@ -1,7 +1,7 @@ Purpose: Check the `help` subtool runs. -RUN: %dexter_base help | FileCheck --dump-input-context=999999999 %s +RUN: %dexter_base help | FileCheck %s CHECK: The following subtools are available: CHECK: help CHECK: list-debuggers diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test index 68a5173e01af4..2bce540ced181 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/list-debuggers/list-debuggers.test @@ -1,7 +1,7 @@ Purpose: Check the `list-debuggers` subtool runs. -RUN: %dexter_base list-debuggers | FileCheck --dump-input-context=999999999 %s +RUN: %dexter_base list-debuggers | FileCheck %s CHECK: lldb CHECK: vs2015 CHECK: vs2017 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 9c9600e530a33..133679ee6950f 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,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: not %dexter_regression_test_run --binary %t -v -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_regression_test_run --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 b17efdf90aead..0921d7991bb6e 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,7 +2,7 @@ // 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 --binary %t -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines +// RUN: not %dexter_regression_test_run --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')) 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 abe3e7c8f0317..6839360a7f3bc 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,7 +2,7 @@ // 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 --binary %t -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines +// RUN: not %dexter_regression_test_run --binary %t -v -- %s | FileCheck %s --match-full-lines int main() { 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 d0aa0f198aa37..89d6fb85d8d60 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,7 +2,7 @@ // 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 --binary %t -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines +// RUN: not %dexter_regression_test_run --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') 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 663a4c86c6d44..da15735252533 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,7 @@ // Check that bad keyword args in \DexLabel are reported. // Use --binary switch to trick dexter into skipping the build step. // -// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args -- %s | FileCheck %s // CHECK: parser error:{{.*}}err_label_kwarg.cpp(8): unexpected named args: bad_arg // DexLabel('test', bad_arg=0) diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_limit_steps_no_values.cpp index 1dd211527a525..978450eeb8cd8 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,7 @@ // in a \DexLimitSteps command results in a useful error message. // Use --binary switch to trick dexter into skipping the build step. // -// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: not %dexter_base test --binary %s %dexter_regression_test_debugger_args -- %s | FileCheck %s // CHECK: parser error:{{.*}}err_limit_steps_no_values.cpp(9): expected 0 or at least 2 positional arguments // DexLimitSteps('test') diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/test/err_paren.cpp index 8bae934540a2b..e80b34da24ac4 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 @@ -6,7 +6,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \ -// RUN: -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines --strict-whitespace +// RUN: -v -- %s | FileCheck %s --match-full-lines --strict-whitespace // // CHECK:parser error:{{.*}}err_paren.cpp(19): Unbalanced parenthesis starting here // CHECK:// {{Dex}}ExpectWatchValue( 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 f7803eec49ea1..8d5a9b0575996 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 @@ -6,7 +6,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \ -// RUN: -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines --strict-whitespace +// 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( 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 be4402d25088b..7e019df26e9bd 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 @@ -6,7 +6,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \ -// RUN: -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines --strict-whitespace +// 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 3914f2a284a0d..0fdf255eded8f 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 @@ -4,7 +4,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args -v -- %s \ -// RUN: | FileCheck --dump-input-context=999999999 %s --implicit-check-not=FAIL-FILENAME-MATCH +// 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 c071649d678ed..342f2a53010ec 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 @@ -6,7 +6,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \ -// RUN: -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines --strict-whitespace +// 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 836eec04cf203..2865304101939 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 @@ -6,7 +6,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \ -// RUN: -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines --strict-whitespace +// 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 f47a5685a092c..1062d2816b397 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 @@ -6,7 +6,7 @@ // // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: not %dexter_base test --binary %t %dexter_regression_test_debugger_args \ -// RUN: -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines --strict-whitespace +// 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 2c26c2a6c7790..66a5e46254579 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,7 +2,7 @@ // 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 --binary %t -v -- %s | FileCheck --dump-input-context=999999999 %s --match-full-lines +// RUN: not %dexter_regression_test_run --binary %t -v -- %s | FileCheck %s --match-full-lines int main() { 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 330b5098507d1..a28758a8fb53b 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,7 +3,7 @@ // 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 --binary %t -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t -- %s | FileCheck %s // CHECK: label_another_line.cpp: (1.0000) int main() { 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 83f46de82b3b2..334b6a565ee2e 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,7 @@ // Check that we can use label-relative line numbers. // // RUN: %dexter_regression_test_cxx_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t -v -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --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 b294140b46fd5..d8a253e70f6b3 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,7 +2,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_c_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t --target-run-args "a b 'c d'" -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --binary %t --target-run-args "a b 'c d'" -- %s | FileCheck %s // CHECK: target_run_args.c: int main(int argc, const char **argv) { 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 9ac98d82660cb..1f8ed5f189936 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,7 +2,7 @@ // UNSUPPORTED: system-windows // // RUN: %dexter_regression_test_c_build %s -o %t -// RUN: %dexter_regression_test_run --binary %t --target-run-args "a b 'c d'" -- %s | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_regression_test_run --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) { diff --git a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/view.cpp b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/view.cpp index d31eafee4b87d..58e3644be5620 100644 --- a/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/view.cpp +++ b/cross-project-tests/debuginfo-tests/dexter/feature_tests/subtools/view.cpp @@ -4,7 +4,7 @@ // RUN: %dexter_regression_test_cxx_build %s -o %t // RUN: %dexter_regression_test_run --binary %t --results %t.results -- %s // -// RUN: %dexter_base view %t.results/view.cpp.dextIR | FileCheck --dump-input-context=999999999 %s +// RUN: %dexter_base view %t.results/view.cpp.dextIR | FileCheck %s // CHECK: ## BEGIN // CHECK: ## END //