mirror of
https://git.savannah.gnu.org/git/make.git
synced 2025-01-01 01:33:51 +00:00
87a5f98d24
Delay the generation of error messages for included files until we are sure that we can't rebuild that included file. * dep.h (struct dep): Don't reuse "changed"; make a separate field to keep "flags". Get rid of dontcare and use the flag. (struct goaldep): Create a new structure for goal prereqs that tracks an errno value and the floc where the include happened. Rework the structures to ensure they are supersets as expected. In maintainer mode with GCC, use inline to get type checking. * read.c (eval_makefile): Return a struct goaldep for the new makefile. Ensure errno is set properly to denote a failure. (read_all_makefiles): Switch to goaldep and check errno. (eval): Don't show included file errors; instead remember them. * remake.c (update_goal_chain): Set global variables to the current goaldep we're building, and the entire chain. (show_goal_error): Check if the current failure is a consequence of building an included makefile and if so print an error. (complain): Call show_goal_error() on rule failure. * job.c (child_error): Call show_goal_error() on child error. * main.c (main): Switch from struct dep to goaldep. * misc.c (free_dep_chain): Not used; make into a macro. * tests/scripts/features/include: Update and include new tests. * tests/scripts/options/dash-B, tests/scripts/options/dash-W, tests/scripts/options/print-directory, tests/scripts/variables/MAKE_RESTARTS: Update known-good-output.
33 lines
720 B
Perl
33 lines
720 B
Perl
# -*-perl-*-
|
|
|
|
$description = "Test the -w option to GNU make.";
|
|
|
|
# Simple test without -w
|
|
run_make_test(q!
|
|
all: ; @echo hi
|
|
!,
|
|
"", "hi\n");
|
|
|
|
# Simple test with -w
|
|
run_make_test(undef, "-w",
|
|
"#MAKE#: Entering directory '#PWD#'\nhi\n#MAKE#: Leaving directory '#PWD#'\n");
|
|
|
|
# Test makefile rebuild to ensure no enter/leave
|
|
run_make_test(q!
|
|
include foo
|
|
all: ;@:
|
|
foo: ; touch foo
|
|
!,
|
|
"", "touch foo\n");
|
|
unlink('foo');
|
|
|
|
# Test makefile rebuild with -w
|
|
run_make_test(q!
|
|
include foo
|
|
all: ;@:
|
|
foo: ; touch foo
|
|
!,
|
|
"-w", "#MAKE#: Entering directory '#PWD#'\ntouch foo\n#MAKE#: Leaving directory '#PWD#'\n");
|
|
unlink('foo');
|
|
|
|
1;
|