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

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/options

Files:

• dash-B (modified) (1 diff)
• dash-I (modified) (1 diff)
• dash-W (copied) (copied from vendor/gnumake/current/tests/scripts/options/dash-W )
• dash-e (modified) (1 diff)
• symlinks (modified) (2 diffs)
• warn-undefined-variables (copied) (copied from vendor/gnumake/current/tests/scripts/options/warn-undefined-variables )

trunk/src/gmake/tests/scripts/options/dash-B

@@ -32 +32 @@
 run_make_test(undef, '-B', 'cp bar.x foo');
 
-
 # Clean up
 
 rmfiles('bar.x', 'foo');
 
+# Test -B with the re-exec feature: we don't want to re-exec forever
+# Savannah bug # 7566
+
+run_make_test('
+all: ; @:
+$(info MAKE_RESTARTS=$(MAKE_RESTARTS))
+include foo.x
+foo.x: ; @touch $@
+',
+              '-B', 'MAKE_RESTARTS=
+#MAKEFILE#:4: foo.x: No such file or directory
+MAKE_RESTARTS=1');
+
+rmfiles('foo.x');
+
+# Test -B with the re-exec feature: we DO want -B in the "normal" part of the
+# makefile.
+
+&touch('blah.x');
+
+run_make_test('
+all: blah.x ; @echo $@
+$(info MAKE_RESTARTS=$(MAKE_RESTARTS))
+include foo.x
+foo.x: ; @touch $@
+blah.x: ; @echo $@
+',
+              '-B', 'MAKE_RESTARTS=
+#MAKEFILE#:4: foo.x: No such file or directory
+MAKE_RESTARTS=1
+blah.x
+all');
+
+rmfiles('foo.x', 'blah.x');
+
 1;

trunk/src/gmake/tests/scripts/options/dash-I

@@ +1 @@
+#                                                                    -*-perl-*-
+
 $description ="The following test creates a makefile to test the -I option.";
 

trunk/src/gmake/tests/scripts/options/dash-e

@@ -5 +5 @@
 $details = "";
 
-$ENV{GOOGLE} = 'boggle';
+$extraENV{GOOGLE} = 'boggle';
 
 open(MAKEFILE,"> $makefile");

trunk/src/gmake/tests/scripts/options/symlinks

@@ -6 +6 @@
 
 # Only run these tests if the system sypports symlinks
-if (eval { symlink("",""); 1 }) {
+
+# Apparently the Windows port of Perl reports that it does support symlinks
+# (in that the symlink() function doesn't fail) but it really doesn't, so
+# check for it explicitly.
+
+if ($port_type eq 'W32' || !( eval { symlink("",""); 1 })) {
+  # This test is N/A 
+  -1;
+} else {
 
   # Set up a symlink sym -> dep
@@ -43 +51 @@
 
   rmfiles('targ', 'dep', 'sym', 'dep1');
+
+  # Check handling when symlinks point to non-existent files.  Without -L we
+  # should get an error: with -L we should use the timestamp of the symlink.
+
+  symlink("../$dirname/dep", 'sym');
+  run_make_test('targ: sym ; @echo make $@ from $<', '',
+                "#MAKE#: *** No rule to make target `sym', needed by `targ'.  Stop.", 512);
+
+  run_make_test('targ: sym ; @echo make $@ from $<', '-L',
+                'make targ from sym');
+
+
+  rmfiles('targ', 'sym');
+
+  1;
 }
-
-1;