summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/ChangeLog1
-rw-r--r--tests/scripts/options/dash-n12
2 files changed, 11 insertions, 2 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index ad01213..c742ac1 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -7,6 +7,7 @@
* scripts/features/reinvoke: Make more robust by touching "b"
first, to ensure it's not newer than "a".
Reported by Marco Franzen <Marco.Franzen@Thyron.com>.
+ * scripts/options/dash-n: Ditto.
* scripts/functions/call: Whoops. The fix to PR/1527 caused
recursive invocations of $(call ...) to break. I can't come up
diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index 73e946e..98f1d21 100644
--- a/tests/scripts/options/dash-n
+++ b/tests/scripts/options/dash-n
@@ -18,17 +18,20 @@ close(MAKEFILE);
&touch('orig');
+# TEST 0
+
&run_make_with_options($makefile, "", &get_logfile);
$answer = "echo >> intermediate\necho >> final\n";
&compare_output($answer, &get_logfile(1));
+# TEST 1
+
&run_make_with_options($makefile, "-Worig -n", &get_logfile);
$answer = "echo >> intermediate\necho >> final\n";
&compare_output($answer, &get_logfile(1));
unlink('orig', 'intermediate', 'final');
-# TEST2
# We consider the actual updated timestamp of targets with all
# recursive commands, even with -n.
@@ -46,14 +49,19 @@ EOF
close(MAKEFILE);
-&touch('a', 'b');
+&touch('b');
+&touch('a');
sleep(1);
&touch('c');
+# TEST 2
+
&run_make_with_options($makefile2, "", &get_logfile);
$answer = "$make_name: `a' is up to date.\n";
&compare_output($answer, &get_logfile(1));
+# TEST 3
+
&run_make_with_options($makefile2, "-n", &get_logfile);
$answer = "$make_name: `a' is up to date.\n";
&compare_output($answer, &get_logfile(1));