From dceb954f9c0a948b8d53796fd78b7cfae9148b1b Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sat, 13 Jun 2009 23:10:52 +0000 Subject: - Fix Savannah bug #13401 --- tests/ChangeLog | 4 ++++ tests/scripts/variables/MAKEFILES | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) (limited to 'tests') diff --git a/tests/ChangeLog b/tests/ChangeLog index ddae67e..7b414c5 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,9 @@ 2009-06-13 Paul Smith + * scripts/variables/MAKEFILES: Verify that MAKEFILES included + files (and files included by them) don't set the default goal. + Savannah bug #13401. + * scripts/functions/wildcard: Test that wildcards with non-existent glob matchers return empty. diff --git a/tests/scripts/variables/MAKEFILES b/tests/scripts/variables/MAKEFILES index 3be284b..b23da8e 100644 --- a/tests/scripts/variables/MAKEFILES +++ b/tests/scripts/variables/MAKEFILES @@ -31,4 +31,23 @@ close(MAKEFILE); $answer = "DEFAULT RULE: M2=m2 M3=m3\n"; &compare_output($answer,&get_logfile(1)); +# TEST 2: Verify that included makefiles don't set the default goal. +# See Savannah bug #13401. + +create_file('xx-inc.mk', ' +include_goal: ; @echo $@ +include xx-ind.mk +'); + +create_file('xx-ind.mk', ' +indirect_goal: ; @echo $@ +'); + +run_make_test(q! +top: ; @echo $@ +!, + 'MAKEFILES=xx-inc.mk', "top\n"); + +unlink(qw(xx-inc.mk xx-ind.mk)); + 1; -- cgit v1.2.3