From cc442294b8c9abfd87bdcb8019574f4e1ed23ea9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 22 Apr 2012 14:32:03 +0100 Subject: Add testsuite case retry (without update) option on failed file compare. --- test/runtest | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/runtest') diff --git a/test/runtest b/test/runtest index 31aaaa902..c199539a5 100755 --- a/test/runtest +++ b/test/runtest @@ -938,7 +938,7 @@ if ($_[1]) { $_ = "u"; print "... update forced\n"; } # [4] TRUE if this is a log file whose deliveries must be sorted # # Returns: 0 comparison succeeded or differences to be ignored -# 1 comparison failed; files were updated (=> re-compare) +# 1 comparison failed; files may have been updated (=> re-compare) # # Does not return if the user replies "Q" to a prompt. @@ -1096,9 +1096,10 @@ if (-e $sf) print "\n"; for (;;) { - interact("Continue, Update & retry, Quit? [Q] ", $force_update); + interact("Continue, Retry, Update & retry, Quit? [Q] ", $force_update); tests_exit(1) if /^q?$/i; return 0 if /^c$/i; + return 1 if /^r$/i; last if (/^u$/i); } } @@ -1130,7 +1131,7 @@ return 1; # # Arguments: none # Returns: 0 if the output compared equal -# 1 if files were updated and the test must be re-run +# 1 if re-run needed (files may have been updated) sub check_output{ my($yield) = 0; -- cgit v1.2.3