diff options
author | Paul Smith <psmith@gnu.org> | 2000-06-19 21:22:44 +0000 |
---|---|---|
committer | Paul Smith <psmith@gnu.org> | 2000-06-19 21:22:44 +0000 |
commit | 0d70d054586cf2e718aacd5fccfc47e32975b092 (patch) | |
tree | 32fb96cf9f4774e02ed385228361ad31cc4bb901 /tests/scripts/options | |
parent | f04e78f11bb42e911a62c52c410575f602d8dec5 (diff) | |
download | gunmake-0d70d054586cf2e718aacd5fccfc47e32975b092.tar.gz |
* Various fixes for problems in the 3.79.0.1 pretest.
Diffstat (limited to 'tests/scripts/options')
-rw-r--r-- | tests/scripts/options/general | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/scripts/options/general b/tests/scripts/options/general index ec7149a..d35bb35 100644 --- a/tests/scripts/options/general +++ b/tests/scripts/options/general @@ -5,17 +5,21 @@ open(MAKEFILE, "> $makefile"); # The Contents of the MAKEFILE ... -print MAKEFILE "foo 5foo: ; \@echo \$\@\n"; +print MAKEFILE "foo 1foo: ; \@echo \$\@\n"; close(MAKEFILE); # TEST 0 -&run_make_with_options($makefile, "-j 5foo", &get_logfile); -$answer = "5foo\n"; -&compare_output($answer, &get_logfile(1)); +&run_make_with_options($makefile, "-j 1foo", &get_logfile); +if (!$parallel_jobs) { + $answer = "$make_name: Parallel jobs (-j) are not supported on this platform.\n$make_name: Resetting to single job (-j1) mode.\n1foo\n"; +} +else { + $answer = "1foo\n"; +} -# TEST 0 +# TEST 1 # This test prints the usage string; I don't really know a good way to # test it. I guess I could invoke make with a known-bad option to see @@ -24,7 +28,7 @@ $answer = "5foo\n"; # If I were always on UNIX, I could invoke it with 2>/dev/null, then # just check the error code. -&run_make_with_options($makefile, "-j5foo 2>/dev/null", &get_logfile, 512); +&run_make_with_options($makefile, "-j1foo 2>/dev/null", &get_logfile, 512); $answer = ""; &compare_output($answer, &get_logfile(1)); |