From cb2f20026908d5c6e48e2cd3e3e65b5f67498d02 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 3 Mar 2005 17:39:48 +0000 Subject: Fixed stem termination and stem triple-expansion bugs. --- tests/scripts/features/se_implicit | 36 +++++++++++++++++++++++++++++++++++ tests/scripts/features/se_statpat | 18 ++++++++++++++++++ tests/scripts/features/statipattrules | 6 +++--- 3 files changed, 57 insertions(+), 3 deletions(-) (limited to 'tests/scripts/features') diff --git a/tests/scripts/features/se_implicit b/tests/scripts/features/se_implicit index b6b726c..0c38c17 100644 --- a/tests/scripts/features/se_implicit +++ b/tests/scripts/features/se_implicit @@ -183,6 +183,42 @@ foo.c: ; @echo $@ foo.o: {foo.c} foo.c '); +# Test #7: Test stem from the middle of the name. +# +run_make_test(' +foobarbaz: + +foo%baz: % $$*.1 + @echo $* + +bar bar.1: + @echo $@ + +', +'', +'bar +bar.1 +bar +'); + +# Test #8: Make sure stem triple-expansion does not happen. +# +run_make_test(' +foo$$bar: + +f%r: % $$*.1 + @echo \'$*\' + +oo$$ba oo$$ba.1: + @echo \'$@\' + +', +'', +'oo$ba +oo$ba.1 +oo$ba +'); + # This tells the test driver that the perl test script executed properly. 1; diff --git a/tests/scripts/features/se_statpat b/tests/scripts/features/se_statpat index 9f1b4a3..3c54622 100644 --- a/tests/scripts/features/se_statpat +++ b/tests/scripts/features/se_statpat @@ -102,5 +102,23 @@ baz.a.1 baz.a.2 '); + +# Test #4: Make sure stem triple-expansion does not happen. +# +run_make_test(' +foo$$bar: f%r: % $$*.1 + @echo \'$*\' + +oo$$ba oo$$ba.1: + @echo \'$@\' + +', +'', +'oo$ba +oo$ba.1 +oo$ba +'); + + # This tells the test driver that the perl test script executed properly. 1; diff --git a/tests/scripts/features/statipattrules b/tests/scripts/features/statipattrules index 7d35ec3..b5459b9 100644 --- a/tests/scripts/features/statipattrules +++ b/tests/scripts/features/statipattrules @@ -55,11 +55,11 @@ unlink('foo.el', 'bar.c', 'lose.c'); $makefile2 = &get_tmpfile; open(MAKEFILE, "> $makefile2"); -print MAKEFILE "foo: foo%: % ; \@echo $@\n"; +print MAKEFILE "foo: foo%: % ; \@echo \$@\n"; close(MAKEFILE); -&run_make_with_options($makefile2, '', &get_logfile, 512); -$answer = "$makefile2:1: *** target `foo' leaves prerequisite pattern empty. Stop.\n"; +&run_make_with_options($makefile2, '', &get_logfile); +$answer = "foo\n"; &compare_output($answer, &get_logfile(1)); # TEST #5 -- bug #12180: core dump on a stat pattern rule with an empty -- cgit v1.2.3