From 3da939686c216f8d16a6aaae7831f4bb18c83483 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Thu, 13 Aug 2020 14:36:17 -0700 Subject: [PATCH] [lldb] Improve diagnostics in lldb-repro when replay fails - Print the replay invocation. - Keep the reproducer around. - Return the "opposite" exit code so we don't have to rely on FileCheck to fail the test when the expected exit code is non-zero. --- lldb/utils/lldb-repro/lldb-repro.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lldb/utils/lldb-repro/lldb-repro.py b/lldb/utils/lldb-repro/lldb-repro.py index 2b7b23f..928e100 100755 --- a/lldb/utils/lldb-repro/lldb-repro.py +++ b/lldb/utils/lldb-repro/lldb-repro.py @@ -62,9 +62,14 @@ def main(): # exit code and return that for tests that expect a non-zero exit code. exit_code_path = os.path.join(reproducer_path, 'exit_code.txt') if sys.argv[1] == "replay": + replay_exit_code = exit_code with open(exit_code_path, 'r') as f: - assert exit_code == 0 exit_code = int(f.read()) + if replay_exit_code != 0: + print("error: replay failed with exit code {}".format(replay_exit_code)) + print("invocation: " + " ".join(new_args)) + # Return 1 if the expected exit code is 0 or vice versa. + return 1 if (exit_code == 0) else 0 shutil.rmtree(reproducer_path, True) elif sys.argv[1] == "capture": with open(exit_code_path, 'w') as f: -- 2.7.4