diff options
Diffstat (limited to 'tests/scripts/options')
-rw-r--r-- | tests/scripts/options/dash-B | 3 | ||||
-rw-r--r-- | tests/scripts/options/dash-W | 5 | ||||
-rw-r--r-- | tests/scripts/options/dash-k | 2 | ||||
-rw-r--r-- | tests/scripts/options/shuffle | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/tests/scripts/options/dash-B b/tests/scripts/options/dash-B index 4c4c4cfb..6a36e8d4 100644 --- a/tests/scripts/options/dash-B +++ b/tests/scripts/options/dash-B @@ -26,7 +26,8 @@ run_make_test(undef, '', "#MAKE#: Nothing to be done for 'all'."); run_make_test(undef, '-B', 'cp bar.x foo'); # Put the timestamp for foo into the future; it should still be remade. - +# There are clock skew errors printed here but they will be cleared by +# the comparison code. utouch(1000, 'foo'); run_make_test(undef, '', "#MAKE#: Nothing to be done for 'all'."); run_make_test(undef, '-B', 'cp bar.x foo'); diff --git a/tests/scripts/options/dash-W b/tests/scripts/options/dash-W index 857b1cce..fe4d2355 100644 --- a/tests/scripts/options/dash-W +++ b/tests/scripts/options/dash-W @@ -19,7 +19,8 @@ run_make_test(undef, '', "#MAKE#: 'a.x' is up to date."); run_make_test(undef, '-W b.x', 'echo >> a.x'); # Put the timestamp for a.x into the future; it should still be remade. - +# There are clock skew errors printed here but they will be cleared by +# the comparison code. utouch(1000, 'a.x'); run_make_test(undef, '', "#MAKE#: 'a.x' is up to date."); run_make_test(undef, '-W b.x', 'echo >> a.x'); @@ -50,6 +51,8 @@ touch baz.x'); # Now run with -W bar.x # Tweak foo.x's timestamp so the update will change it. +# There are clock skew errors printed here but they will be cleared by +# the comparison code. &utouch(1000, 'foo.x'); run_make_test(undef, '-W bar.x', "restarts=\ntouch foo.x\nrestarts=1\ntouch baz.x"); diff --git a/tests/scripts/options/dash-k b/tests/scripts/options/dash-k index 4bd68f03..fec630c3 100644 --- a/tests/scripts/options/dash-k +++ b/tests/scripts/options/dash-k @@ -108,7 +108,7 @@ ifile: no-such-file; exit 1 '-k', "#MAKEFILE#:2: ifile: $ERR_no_such_file #MAKE#: *** No rule to make target 'no-such-file', needed by 'ifile'. -#MAKEFILE#:2: Failed to remake makefile 'ifile'.\n", +#MAKEFILE#:2: failed to remake makefile 'ifile'", 512); } diff --git a/tests/scripts/options/shuffle b/tests/scripts/options/shuffle index 5661683c..c19128f7 100644 --- a/tests/scripts/options/shuffle +++ b/tests/scripts/options/shuffle @@ -92,7 +92,7 @@ all: a_ b_ ; @echo $@ a_: b_ b_: a_ ', - '--shuffle=reverse', "#MAKE#: Circular a_ <- b_ dependency dropped.\na_\nb_\nall"); + '--shuffle=reverse', "#MAKE#: circular a_ <- b_ dependency dropped\na_\nb_\nall"); # Check if order-only dependencies get reordered. run_make_test(' |