Changeset 503 for trunk/src/gmake/tests/scripts/variables

Timestamp:

Sep 15, 2006, 7:09:38 AM (19 years ago)

Author:

bird

Message:

Untested merge with GNU Make v3.81 (vendor/gnumake/2005-05-16 -> vendor/gnumake/current).

Location:

trunk/src/gmake/tests/scripts/variables

Files:

• INCLUDE_DIRS (copied) (copied from vendor/gnumake/current/tests/scripts/variables/INCLUDE_DIRS )
• MAKE_RESTARTS (copied) (copied from vendor/gnumake/current/tests/scripts/variables/MAKE_RESTARTS )
• SHELL (modified) (3 diffs)
• automatic (modified) (5 diffs)
• negative (copied) (copied from vendor/gnumake/current/tests/scripts/variables/negative )

trunk/src/gmake/tests/scripts/variables/SHELL

@@ -5 +5 @@
 # Find the default value when SHELL is not set.  On UNIX it will be /bin/sh,
 # but on other platforms who knows?
-$oshell = $ENV{SHELL};
+resetENV();
 delete $ENV{SHELL};
-$mshell = `echo 'all:;\@echo \$(SHELL)' | $make_name -f-`;
+$mshell = `echo 'all:;\@echo \$(SHELL)' | $make_path -f-`;
 chop $mshell;
 
 # According to POSIX, the value of SHELL in the environment has no impact on
 # the value in the makefile.
+# Note %extraENV takes precedence over the default value for the shell.
 
-$ENV{SHELL} = '/dev/null';
+$extraENV{SHELL} = '/dev/null';
 run_make_test('all:;@echo "$(SHELL)"', '', $mshell);
 
@@ -19 +20 @@
 # exported to the subshell!  I wanted to set SHELL to be $^X (perl) in the
 # makefile, but make runs $(SHELL) -c 'commandline' and that doesn't work at
-# all when $(SHELL) is perl :-/.  So, we just add an extra initial / and hope
-# for the best on non-UNIX platforms :-/.
+# all when $(SHELL) is perl :-/.  So, we just add an extra initial /./ which
+# works well on UNIX and seems to work OK on at least some non-UNIX systems.
 
-$ENV{SHELL} = $mshell;
+$extraENV{SHELL} = $mshell;
 
-run_make_test("SHELL := /$mshell\n".'
+run_make_test("SHELL := /./$mshell\n".'
 all:;@echo "$(SHELL) $$SHELL"
-', '', "/$mshell $mshell");
+', '', "/./$mshell $mshell");
 
 # As a GNU make extension, if make's SHELL variable is explicitly exported,
 # then we really _DO_ export it.
 
-run_make_test("export SHELL := /$mshell\n".'
+$extraENV{SHELL} = $mshell;
+
+run_make_test("export SHELL := /./$mshell\n".'
 all:;@echo "$(SHELL) $$SHELL"
-', '', "/$mshell /$mshell");
+', '', "/./$mshell /./$mshell");
 
 
@@ -39 +42 @@
 # variable.
 
-run_make_test("all: SHELL := /$mshell\n".'
+$extraENV{SHELL} = $mshell;
+
+run_make_test("all: SHELL := /./$mshell\n".'
 all:;@echo "$(SHELL) $$SHELL"
-', '', "/$mshell $mshell");
+', '', "/./$mshell $mshell");
 
-run_make_test("all: export SHELL := /$mshell\n".'
+$extraENV{SHELL} = $mshell;
+
+run_make_test("all: export SHELL := /./$mshell\n".'
 all:;@echo "$(SHELL) $$SHELL"
-', '', "/$mshell $mshell");
+', '', "/./$mshell $mshell");
 
 1;

trunk/src/gmake/tests/scripts/variables/automatic

@@ -28 +28 @@
 close(MAKEFILE);
 
-# TEST #1 -- simple test
+# TEST #0 -- simple test
 # -------
 
@@ -47 +47 @@
 unlink(qw(foo.x bar.y baz.z));
 
-# TEST #2 -- test the SysV emulation of $$@ etc.
+# TEST #1 -- test the SysV emulation of $$@ etc.
 # -------
 
@@ -55 +55 @@
 print MAKEFILE "dir = $dir\n";
 print MAKEFILE <<'EOF';
+.SECONDEXPANSION:
 .SUFFIXES:
 .DEFAULT: ; @echo '$@'
@@ -79 +80 @@
 &compare_output($answer, &get_logfile(1));
 
-# TEST #3 -- test for Savannah bug #12320.
+# TEST #2 -- test for Savannah bug #12320.
 #
 run_make_test('
@@ -87 +88 @@
         @echo $*
 
-mbr.src: ; @:
+mbr.src: ; @:',
+              '',
+              'mbr');
 
-',
-'',
-'mbr
-');
+# TEST #3 -- test for Savannah bug #8154
+# Make sure that nonexistent prerequisites are listed in $?, since they are
+# considered reasons for the target to be rebuilt.
+#
+# This was undone due to Savannah bug #16002.  We'll re-do it in the next
+# release.  See Savannah bug #16051.
+
+#touch('foo');
+#
+#run_make_test('
+#foo: bar ; @echo "\$$? = $?"
+#bar: ;',
+#              '',
+#              '$? = bar');
+#
+#unlink('foo');
 
 1;