mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-12-28 15:57:48 +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.
61 lines
1.2 KiB
Perl
61 lines
1.2 KiB
Perl
# -*-perl-*-
|
|
|
|
$description = "Test the MAKE_RESTARTS variable.";
|
|
|
|
# Test basic capability
|
|
|
|
run_make_test('
|
|
all: ; @:
|
|
$(info MAKE_RESTARTS=$(MAKE_RESTARTS))
|
|
include foo.x
|
|
foo.x: ; @touch $@
|
|
',
|
|
'', 'MAKE_RESTARTS=
|
|
MAKE_RESTARTS=1');
|
|
|
|
rmfiles('foo.x');
|
|
|
|
# Test multiple restarts
|
|
|
|
run_make_test('
|
|
all: ; @:
|
|
$(info MAKE_RESTARTS=$(MAKE_RESTARTS))
|
|
include foo.x
|
|
foo.x: ; @echo "include bar.x" > $@
|
|
bar.x: ; @touch $@
|
|
',
|
|
'', 'MAKE_RESTARTS=
|
|
MAKE_RESTARTS=1
|
|
MAKE_RESTARTS=2');
|
|
|
|
rmfiles('foo.x', 'bar.x');
|
|
|
|
# Test multiple restarts and make sure the variable is cleaned up
|
|
|
|
run_make_test('
|
|
recurse:
|
|
@echo recurse MAKE_RESTARTS=$$MAKE_RESTARTS
|
|
@$(MAKE) -f #MAKEFILE# all
|
|
all:
|
|
@echo all MAKE_RESTARTS=$$MAKE_RESTARTS
|
|
$(info MAKE_RESTARTS=$(MAKE_RESTARTS))
|
|
include foo.x
|
|
foo.x: ; @echo "include bar.x" > $@
|
|
bar.x: ; @touch $@
|
|
',
|
|
'', "MAKE_RESTARTS=
|
|
MAKE_RESTARTS=1
|
|
MAKE_RESTARTS=2
|
|
recurse MAKE_RESTARTS=
|
|
#MAKE#[1]: Entering directory '#PWD#'
|
|
MAKE_RESTARTS=
|
|
all MAKE_RESTARTS=
|
|
#MAKE#[1]: Leaving directory '#PWD#'");
|
|
|
|
rmfiles('foo.x', 'bar.x');
|
|
|
|
1;
|
|
|
|
### Local Variables:
|
|
### eval: (setq whitespace-action (delq 'auto-cleanup whitespace-action))
|
|
### End:
|