From ebd05dbeb31dbc09c496d76e802d9b68bd848e9a Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Wed, 18 Sep 2002 20:51:58 +0000 Subject: Fix a bug exporting/unexporting multiple variables in one command. Update the text about reporting bugs. --- tests/ChangeLog | 5 +++ tests/scripts/features/export | 75 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/ChangeLog b/tests/ChangeLog index a2edc50..9b5c792 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2002-09-18 Paul D. Smith + + * scripts/features/export: Test export/unexport of multiple + variables in a single command. + 2002-09-17 Paul D. Smith * scripts/features/targetvars: Tests for Bug #940: test diff --git a/tests/scripts/features/export b/tests/scripts/features/export index 3d630a4..1690ee8 100644 --- a/tests/scripts/features/export +++ b/tests/scripts/features/export @@ -25,7 +25,6 @@ BOTZ = botz export BITZ BOTZ unexport BOTZ - ifdef EXPORT_ALL export endif @@ -173,5 +172,79 @@ $answer = "foo=f-ok bar=b-ok\nfoo= bar=\n"; &compare_output($answer,&get_logfile(1)); +# TEST 7: Test exporting multiple variables on the same line + +$makefile4 = &get_tmpfile; + +open(MAKEFILE, "> $makefile4"); + +print MAKEFILE <<'EOF'; + +A = a +B = b +C = c +D = d +E = e +F = f +G = g +H = h +I = i +J = j + +SOME = A B C + +export F G H I J + +export D E $(SOME) + +all: ; @echo A=$$A B=$$B C=$$C D=$$D E=$$E F=$$F G=$$G H=$$H I=$$I J=$$J +EOF + +close(MAKEFILE); + +&run_make_with_options($makefile4,"",&get_logfile,0); +$answer = "A=a B=b C=c D=d E=e F=f G=g H=h I=i J=j\n"; +&compare_output($answer,&get_logfile(1)); + + +# TEST 8: Test unexporting multiple variables on the same line + +$makefile5 = &get_tmpfile; + +open(MAKEFILE, "> $makefile5"); + +print MAKEFILE <<'EOF'; + +A = a +B = b +C = c +D = d +E = e +F = f +G = g +H = h +I = i +J = j + +SOME = A B C + +unexport F G H I J + +unexport D E $(SOME) + +all: ; @echo A=$$A B=$$B C=$$C D=$$D E=$$E F=$$F G=$$G H=$$H I=$$I J=$$J +EOF + +close(MAKEFILE); + +@ENV{qw(A B C D E F G H I J)} = qw(1 2 3 4 5 6 7 8 9 10); + +&run_make_with_options($makefile5,"",&get_logfile,0); +$answer = "A= B= C= D= E= F= G= H= I= J=\n"; +&compare_output($answer,&get_logfile(1)); + +delete @ENV{qw(A B C D E F G H I J)}; + + # This tells the test driver that the perl test script executed properly. 1; -- cgit v1.2.3