diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 10 | ||||
| -rw-r--r-- | tests/scripts/features/errors | 19 | ||||
| -rw-r--r-- | tests/scripts/features/parallelism | 7 | ||||
| -rw-r--r-- | tests/scripts/features/patternrules | 3 | ||||
| -rw-r--r-- | tests/scripts/features/vpathplus | 1 | ||||
| -rw-r--r-- | tests/scripts/options/dash-k | 1 | ||||
| -rw-r--r-- | tests/scripts/targets/POSIX | 3 | ||||
| -rw-r--r-- | tests/scripts/variables/SHELL | 3 |
8 files changed, 34 insertions, 13 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 5d62930..527ecd8 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,13 @@ +2010-08-29 Paul Smith <psmith@gnu.org> + + * scripts/features/errors: Add new error message to output text. + * scripts/variables/SHELL: Ditto. + * scripts/targets/POSIX: Ditto. + * scripts/options/dash-k: Ditto. + * scripts/features/vpathplus: Ditto. + * scripts/features/patternrules: Ditto. + * scripts/features/parallelism: Ditto. + 2010-08-13 Paul Smith <psmith@gnu.org> * scripts/features/archives: New regression tests for archive diff --git a/tests/scripts/features/errors b/tests/scripts/features/errors index e372fe0..1e4be46 100644 --- a/tests/scripts/features/errors +++ b/tests/scripts/features/errors @@ -42,15 +42,17 @@ close(MAKEFILE); unlink("cleanit"); $cleanit_error = `sh -c "$rm_command cleanit 2>&1"`; +chomp $cleanit_error; $delete_error_code = $? >> 8; # TEST #1 # ------- -$answer = "$rm_command cleanit\n" - . $cleanit_error - ."$make_name: [clean] Error $delete_error_code (ignored)\n" - ."$rm_command foo\n"; +$answer = "$rm_command cleanit +$cleanit_error +$makefile:2: recipe for target `clean' failed +$make_name: [clean] Error $delete_error_code (ignored) +$rm_command foo\n"; &run_make_with_options($makefile,"",&get_logfile); @@ -74,10 +76,11 @@ if (!$vos) # TEST #2 # ------- -$answer = "$rm_command cleanit\n" - . $cleanit_error - ."$make_name: [clean2] Error $delete_error_code (ignored)\n" - ."$rm_command foo\n"; +$answer = "$rm_command cleanit +$cleanit_error +$makefile:5: recipe for target `clean2' failed +$make_name: [clean2] Error $delete_error_code (ignored) +$rm_command foo\n"; &run_make_with_options($makefile,"clean2 -i",&get_logfile); diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism index cc0f84f..22e4aeb 100644 --- a/tests/scripts/features/parallelism +++ b/tests/scripts/features/parallelism @@ -98,14 +98,17 @@ fail.1 fail.2 fail.3: ok: \@sleep 4 \@echo Ok done", - '-rR -j5', 'Fail + '-rR -j5', "Fail +#MAKEFILE#:6: recipe for target `fail.1' failed #MAKE#: *** [fail.1] Error 1 #MAKE#: *** Waiting for unfinished jobs.... Fail +#MAKEFILE#:6: recipe for target `fail.2' failed #MAKE#: *** [fail.2] Error 1 Fail +#MAKEFILE#:6: recipe for target `fail.3' failed #MAKE#: *** [fail.3] Error 1 -Ok done', +Ok done", 512); diff --git a/tests/scripts/features/patternrules b/tests/scripts/features/patternrules index eebe7c0..5cc6b94 100644 --- a/tests/scripts/features/patternrules +++ b/tests/scripts/features/patternrules @@ -110,7 +110,8 @@ $(dir)/foo.bar: ', "dir=$dir", -"#MAKE#: *** [$dir/foo.bar] Error 1", +"#MAKEFILE#:6: recipe for target `$dir/foo.bar' failed +#MAKE#: *** [$dir/foo.bar] Error 1", 512); unlink("$dir/foo.bar"); diff --git a/tests/scripts/features/vpathplus b/tests/scripts/features/vpathplus index a37fbed..c95c8ab 100644 --- a/tests/scripts/features/vpathplus +++ b/tests/scripts/features/vpathplus @@ -86,6 +86,7 @@ cat ${VP}foo.c bar.c > foo.b 2>/dev/null || exit 1 $answer = "not creating notarget.c from notarget.d cat notarget.c > notarget.b 2>/dev/null || exit 1 +$makefile:16: recipe for target `notarget.b' failed $make_name: *** [notarget.b] Error 1 "; diff --git a/tests/scripts/options/dash-k b/tests/scripts/options/dash-k index d87a786..40d9b97 100644 --- a/tests/scripts/options/dash-k +++ b/tests/scripts/options/dash-k @@ -92,6 +92,7 @@ close(MAKEFILE); &run_make_with_options($makefile2, "-k", &get_logfile, $error_code); $answer = "exit 1 +$makefile2:9: recipe for target `foo.o' failed $make_name: *** [foo.o] Error 1 $make_name: Target `all' not remade because of errors.\n"; diff --git a/tests/scripts/targets/POSIX b/tests/scripts/targets/POSIX index 9c30e18..5f854be 100644 --- a/tests/scripts/targets/POSIX +++ b/tests/scripts/targets/POSIX @@ -17,7 +17,8 @@ run_make_test(qq! .POSIX: all: ; \@$script !, - '', "#MAKE#: *** [all] Error $err\n", 512); + '', "#MAKEFILE#:3: recipe for target `all' failed +#MAKE#: *** [all] Error $err\n", 512); # User settings must override .POSIX $flags = '-xc'; diff --git a/tests/scripts/variables/SHELL b/tests/scripts/variables/SHELL index 7b7e7fe..4416ce1 100644 --- a/tests/scripts/variables/SHELL +++ b/tests/scripts/variables/SHELL @@ -81,6 +81,7 @@ run_make_test(qq! .SHELLFLAGS = $flags all: ; \@$script !, - '', "$out#MAKE#: *** [all] Error $err\n", 512); + '', "$out#MAKEFILE#:3: recipe for target `all' failed +#MAKE#: *** [all] Error $err\n", 512); 1; |