Bump the version to 3.82.90.

Fix some doc bugs.
Implement the --trace flag.
Show filename/linenumber on error.
This commit is contained in:
Paul Smith
2010-08-29 23:05:26 +00:00
parent 3b1432d86a
commit a86d1693ba
16 changed files with 183 additions and 65 deletions

View File

@@ -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);

View File

@@ -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);

View File

@@ -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");

View File

@@ -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
";

View File

@@ -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";

View File

@@ -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';

View File

@@ -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;