mirror of
https://github.com/mirror/make.git
synced 2025-01-09 20:00:28 +08:00
7c4e6b0299
Previously if an included makefile was rebuilt as a prerequisite of another included makefile which didn't need to be rebuilt, make would not realize that it needed to re-exec itself. Ensure that if any included makefile target is rebuilt we re-exec. Also ensure that if an included makefile is not readable, and our rule for rebuilding it doesn't actually change it, we will still fail. * src/remake.c (update_goal_chain): If a goal's update was successful then check its status, even if no actual commands were run because it was already up to date. (show_goal_error): Remove superfluous cast. * src/main.c (main): If the makefile remake did nothing, check that we were able to successfully include all the makefiles we care about; if not fail. When generating error messages about included makefiles be sure to show the filename/linenumber information. * test/scripts/features/reinvoke: Add tests for this behavior. * test/scripts/options/dash-k: Update error messages.
108 lines
2.5 KiB
Perl
108 lines
2.5 KiB
Perl
# -*-mode: perl-*-
|
|
|
|
$description = "Test GNU make's auto-reinvocation feature.";
|
|
|
|
$details = "\
|
|
If the makefile or one it includes can be rebuilt then it is, and make
|
|
is reinvoked. We create a rule to rebuild the makefile from a temp
|
|
file, then touch the temp file to make it newer than the makefile.";
|
|
|
|
$omkfile = $makefile;
|
|
|
|
&utouch(-600, 'incl.mk');
|
|
# For some reason if we don't do this then the test fails for systems
|
|
# with sub-second timestamps, maybe + NFS? Not sure.
|
|
&utouch(-1, 'incl-1.mk');
|
|
|
|
run_make_test('
|
|
all: ; @echo running rules.
|
|
|
|
#MAKEFILE# incl.mk: incl-1.mk ; @echo rebuilding $@; echo >> $@
|
|
|
|
include incl.mk',
|
|
'', "rebuilding incl.mk\nrunning rules.\n");
|
|
|
|
# Make sure updating the makefile itself also works
|
|
|
|
&utouch(-600, $omkfile);
|
|
|
|
run_make_test(undef, '', "rebuilding #MAKEFILE#\nrunning rules.\n");
|
|
|
|
&rmfiles('incl.mk', 'incl-1.mk');
|
|
|
|
|
|
# In this test we create an included file that's out-of-date, but then
|
|
# the rule doesn't update it. Make shouldn't re-exec.
|
|
|
|
&utouch(-600, 'b','a');
|
|
#&utouch(-10, 'a');
|
|
&touch('c');
|
|
|
|
run_make_test('
|
|
all: ; @echo hello
|
|
|
|
a : b ; echo >> $@
|
|
|
|
b : c ; test -f $@ || echo >> $@
|
|
|
|
c: ; echo >> $@
|
|
|
|
include $(F)',
|
|
'F=a', "test -f b || echo >> b\nhello\n");
|
|
|
|
# Now try with the file we're not updating being the actual file we're
|
|
# including: this and the previous one test different parts of the code.
|
|
|
|
run_make_test(undef, 'F=b', "test -f b || echo >> b\nhello\n");
|
|
|
|
&rmfiles('a','b','c');
|
|
|
|
# Ensure command line variables are preserved properly across re-exec
|
|
# Tests for Savannah bug #30723
|
|
|
|
run_make_test('
|
|
ifdef RECURSE
|
|
-include foo30723
|
|
endif
|
|
recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
|
|
test: ; @echo F.O=$(F.O)
|
|
foo30723: ; @touch $@
|
|
',
|
|
'--no-print-directory F.O=bar', "F.O=bar\n");
|
|
|
|
unlink('foo30723');
|
|
|
|
# If ANY makefile is rebuilt then we should re-exec
|
|
|
|
run_make_test('
|
|
all: ; @echo RESTARTS=$(MAKE_RESTARTS)
|
|
|
|
m1.d: ; @echo $@; touch $@
|
|
|
|
m2.d: m1.d ; @test -f $< || { echo $@; touch $@; }
|
|
|
|
include m1.d
|
|
-include m2.d
|
|
',
|
|
'', "m1.d\nRESTARTS=1\n");
|
|
|
|
unlink('m1.d', 'm2.d');
|
|
|
|
# Same as before but be sure we get error messages for un-created makefiles
|
|
|
|
run_make_test('
|
|
all: ; @echo RESTARTS=$(MAKE_RESTARTS)
|
|
|
|
m1.d: ; @echo $@; touch $@
|
|
|
|
m2.d: m1.d ; @test -f $< || { echo $@; touch $@; }
|
|
|
|
include m1.d m2.d
|
|
',
|
|
'', "m1.d\n#MAKEFILE#:8: m2.d: $ERR_no_such_file\n", 512);
|
|
|
|
unlink('m1.d', 'm2.d');
|
|
|
|
# This tells the test driver that the perl test script executed properly.
|
|
1;
|