- Fix bug #7144 (infinite loop sometimes with -q and double-colon rules)

- Resolve support request #103195 (rationalize wordlist fn arguments)

1 files changed, 18 insertions, 31 deletions

diff --git a/tests/scripts/options/dash-q b/tests/scripts/options/dash-q
index 923e4c4..56f04a1 100644
--- a/tests/scripts/options/dash-q
+++ b/tests/scripts/options/dash-q
@@ -3,11 +3,9 @@ $description = "Test the -q option.\n";
 
 $details = "Try various uses of -q and ensure they all give the correct results.\n";
 
-open(MAKEFILE, "> $makefile");
-
-# The Contents of the MAKEFILE ...
+# TEST 0
 
-print MAKEFILE <<'EOMAKE';
+run_make_test('
 one:
 two: ;
 three: ; :
@@ -21,50 +19,39 @@ seven: ; \
  $(.XY)
 	: foo
 	$(.XY)
-EOMAKE
-
-close(MAKEFILE);
-
-# TEST 0
-
-&run_make_with_options($makefile, "-q one", &get_logfile);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+',
+              '-q one', '');
 
 # TEST 1
 
-&run_make_with_options($makefile, "-q two", &get_logfile);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-q two', '');
 
 # TEST 2
 
-&run_make_with_options($makefile, "-q three", &get_logfile, 256);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-q three', '', 256);
 
 # TEST 3
 
-&run_make_with_options($makefile, "-q four", &get_logfile);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-q four', '');
 
 # TEST 4
 
-&run_make_with_options($makefile, "-q five", &get_logfile);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-q five', '');
 
 # TEST 5
 
-&run_make_with_options($makefile, "-q six", &get_logfile);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-q six', '');
 
 # TEST 6
 
-&run_make_with_options($makefile, "-q seven", &get_logfile, 256);
-$answer = "";
-&compare_output($answer, &get_logfile(1));
+run_make_test(undef, '-q seven', '', 256);
+
+# TEST 7 : Savannah bug # 7144
+
+run_make_test('
+one:: ; @echo one
+one:: ; @echo two
+',
+              '-q', '', 256);
 
 1;