summaryrefslogtreecommitdiff
path: root/tests/scripts/features
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2005-07-12 04:35:13 +0000
committerPaul Smith <psmith@gnu.org>2005-07-12 04:35:13 +0000
commit1e9dc3ce45ac44ea51292ca964b52ce47fee3ad3 (patch)
tree8bec287893a5b2fb441be612fbac4d64b8d8c8b2 /tests/scripts/features
parent0e30f46a624803455dcc74acf9a333666467d253 (diff)
downloadgunmake-1e9dc3ce45ac44ea51292ca964b52ce47fee3ad3.tar.gz
Various minor updates and code cleanups.
Diffstat (limited to 'tests/scripts/features')
-rw-r--r--tests/scripts/features/export8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/scripts/features/export b/tests/scripts/features/export
index 1690ee8..38efe11 100644
--- a/tests/scripts/features/export
+++ b/tests/scripts/features/export
@@ -56,7 +56,7 @@ FOO= BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
# TEST 1: make sure vars inherited from the parent are exported
-$ENV{FOO} = 1;
+$extraENV{FOO} = 1;
&run_make_with_options($makefile,"",&get_logfile,0);
@@ -65,8 +65,6 @@ FOO=foo BAR= BAZ=baz BOZ=boz BITZ=bitz BOTZ=\n";
&compare_output($answer,&get_logfile(1));
-delete $ENV{FOO};
-
# TEST 2: global export. Explicit unexport takes precedence.
&run_make_with_options($makefile,"EXPORT_ALL=1",&get_logfile,0);
@@ -237,14 +235,12 @@ 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);
+@extraENV{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;