diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/scripts/functions/foreach | 53 |
2 files changed, 34 insertions, 23 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index b33269c..ffb3fe0 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2005-06-09 Paul D. Smith <psmith@gnu.org> + + * scripts/functions/foreach: Add a test for Savannah bug #11913. + 2005-05-31 Boris Kolpackov <boris@kolpackov.net> * scripts/features/include: Add a test for Savannah bug #13216. diff --git a/tests/scripts/functions/foreach b/tests/scripts/functions/foreach index b80751b..1fde12e 100644 --- a/tests/scripts/functions/foreach +++ b/tests/scripts/functions/foreach @@ -1,6 +1,6 @@ # -*-perl-*- -# Updated 6.16.93 variable "MAKE" is default was environment override +# Updated 16 June 1993 variable "MAKE" is default was environment override # For make 3.63 and above $description = "The following test creates a makefile to verify @@ -14,40 +14,47 @@ form of the command is $(foreach var,$list,$text). Several types of foreach loops are tested\n"; -open(MAKEFILE,"> $makefile"); - -# The Contents of the MAKEFILE ... +# TEST 0 # On WIN32 systems, the user's path is found in %Path% ($Path) # $pathvar = (($port_type eq 'Windows') ? "Path" : "PATH"); -print MAKEFILE <<EOF; -foo = bletch null \@ garf +run_make_test(" null := space = ' ' -auto_var = udef space CC null $pathvar MAKE foo CFLAGS WHITE \@ < -av = \$(foreach var, \$(auto_var), \$(origin \$(var)) ) +auto_var = udef space CC null $pathvar".' MAKE foo CFLAGS WHITE @ < +foo = bletch null @ garf +av = $(foreach var, $(auto_var), $(origin $(var)) ) override WHITE := BLACK -for_var = \$(addsuffix .c,foo \$(null) \$(foo) \$(space) \$(av) ) -fe = \$(foreach var2, \$(for_var),\$(subst .c,.o, \$(var2) ) ) +for_var = $(addsuffix .c,foo $(null) $(foo) $(space) $(av) ) +fe = $(foreach var2, $(for_var),$(subst .c,.o, $(var2) ) ) all: auto for2 -auto : -\t\@echo \$(av) -for2: -\t\@echo \$(fe) -EOF +auto : ; @echo $(av) +for2: ; @echo $(fe)', + '-e WHITE=WHITE CFLAGS=', + "undefined file default file environment default file command line override automatic automatic +foo.o bletch.o null.o @.o garf.o .o .o undefined.o file.o default.o file.o environment.o default.o file.o command.o line.o override.o automatic.o automatic.o"); + + +# TEST 1: Test that foreach variables take precedence over global +# variables in a global scope (like inside an eval). Tests bug #11913 + +run_make_test(' +.PHONY: all target +all: target -close(MAKEFILE); +x := BAD -&run_make_with_options($makefile, - "-e WHITE=WHITE CFLAGS=", - &get_logfile); +define mktarget +target: x := $(x) +target: ; @echo "$(x)" +endef -# Create the answer to what should be produced by this Makefile -$answer = "undefined file default file environment default file command line override automatic automatic -foo.o bletch.o null.o @.o garf.o .o .o undefined.o file.o default.o file.o environment.o default.o file.o command.o line.o override.o automatic.o automatic.o\n"; +x := GLOBAL -&compare_output($answer,&get_logfile(1)); +$(foreach x,FOREACH,$(eval $(value mktarget)))', + '', + 'FOREACH'); 1; |