From 1a5beef51f5c32081116e502c1c90a3e32813020 Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Fri, 2 May 2003 01:44:59 +0000 Subject: - Fix bug #1405: allow multiple pattern-specific variables to match a target. - Fix some uncleanliness about the implementation of patterns-specific vars. - Some enhancements to the OS/2 port. --- tests/scripts/features/patspecific_vars | 35 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) (limited to 'tests/scripts') diff --git a/tests/scripts/features/patspecific_vars b/tests/scripts/features/patspecific_vars index 7feb687..9ace5c4 100644 --- a/tests/scripts/features/patspecific_vars +++ b/tests/scripts/features/patspecific_vars @@ -13,14 +13,22 @@ all: one.x two.x three.x FOO = foo BAR = bar BAZ = baz -thr% : override BAZ = three -t%.x: BAR = four -%.x: BAR = two -%.x: override BAZ = three one.x: override FOO = one -one.x two.x three.x: ; @echo $(FOO) $(BAR) $(BAZ) -four.x: baz ; @echo $(FOO) $(BAR) $(BAZ) -baz: ; @echo $(FOO) $(BAR) $(BAZ) +%.x: BAR = two +t%.x: BAR = four +thr% : override BAZ = three +one.x two.x three.x: ; @echo $@: $(FOO) $(BAR) $(BAZ) +four.x: baz ; @echo $@: $(FOO) $(BAR) $(BAZ) +baz: ; @echo $@: $(FOO) $(BAR) $(BAZ) + +# test matching multiple patterns +a%: AAA = aaa +%b: BBB = ccc +a%: BBB += ddd +%b: AAA ?= xxx +%b: AAA += bbb +.PHONY: ab +ab: ; @echo $(AAA); echo $(BBB) EOF close(MAKEFILE); @@ -29,21 +37,28 @@ close(MAKEFILE); # TEST #1 -- basics &run_make_with_options($makefile, "", &get_logfile); -$answer = "one two three\nfoo four baz\nfoo bar three\n"; +$answer = "one.x: one two baz\ntwo.x: foo four baz\nthree.x: foo four three\n"; &compare_output($answer,&get_logfile(1)); # TEST #2 -- try the override feature &run_make_with_options($makefile, "BAZ=five", &get_logfile); -$answer = "one two three\nfoo four five\nfoo bar three\n"; +$answer = "one.x: one two five\ntwo.x: foo four five\nthree.x: foo four three\n"; &compare_output($answer,&get_logfile(1)); # TEST #3 -- make sure patterns are inherited properly &run_make_with_options($makefile, "four.x", &get_logfile); -$answer = "foo two three\nfoo two three\n"; +$answer = "baz: foo two baz\nfour.x: foo two baz\n"; +&compare_output($answer,&get_logfile(1)); + + +# TEST #4 -- test multiple patterns matching the same target + +&run_make_with_options($makefile, "ab", &get_logfile); +$answer = "aaa bbb\nccc ddd\n"; &compare_output($answer,&get_logfile(1)); 1; -- cgit v1.2.3