Changeset 2591 in kBuild for trunk/src/kmk/tests/scripts/features/se_explicit

Timestamp:

Jun 17, 2012 8:45:31 PM (12 years ago)

Author:

bird

Message:

kmk: Merged in changes from GNU make 3.82. Previous GNU make base version was gnumake-2008-10-28-CVS.

Location:

trunk/src/kmk

Files:

• . (modified) (1 prop)
• tests (modified) (1 prop)
• tests/scripts/features/se_explicit (modified) (6 diffs, 1 prop)

trunk/src/kmk

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc

trunk/src/kmk/tests/scripts/features/se_explicit

@@ -27 +27 @@
 # TEST #1: automatic variables.
 #
-run_make_test('
+run_make_test(q!
 .SECONDEXPANSION:
-.DEFAULT: ; @echo $@
+.DEFAULT: ; @echo '$@'
 
 foo: bar baz
@@ -42 +42 @@
      $$*.6
 
-',
+!,
 '-j1',
 'bar
@@ -63 +63 @@
 # Test #2: target/pattern -specific variables.
 #
-run_make_test('
+run_make_test(q!
 .SECONDEXPANSION:
-.DEFAULT: ; @echo $@
+.DEFAULT: ; @echo '$@'
 
 foo.x: $$a $$b
@@ -72 +72 @@
 
 %.x: b := baz
-
-',
+!,
 '',
 'bar
@@ -82 +81 @@
 # Test #3: order of prerequisites.
 #
-run_make_test('
+run_make_test(q!
 .SECONDEXPANSION:
-.DEFAULT: ; @echo $@
+.DEFAULT: ; @echo '$@'
 
 all: foo bar baz
 
 # Subtest #1
-#
 foo: foo.1; @:
-
 foo: foo.2
-
 foo: foo.3
 
-
 # Subtest #2
-#
 bar: bar.2
-
 bar: bar.1; @:
-
 bar: bar.3
 
-
 # Subtest #3
-#
 baz: baz.1
-
 baz: baz.2
-
 baz: ; @:
-
-',
+!,
 '-j1',
 'foo.1
@@ -126 +113 @@
 ');
 
+# TEST #4: eval in a context where there is no reading_file
+run_make_test(q!
+.SECONDEXPANSION:
+all : $$(eval $$(info test))
+!,
+            '', "test\n#MAKE#: Nothing to be done for `all'.\n");
+
+# TEST #5: (NEGATIVE) catch eval in a prereq list trying to create new
+# target/prereq relationships.
+
+run_make_test(q!
+.SECONDEXPANSION:
+proj1.exe : proj1.o $$(eval $$(test))
+define test
+proj1.o : proj1.c
+proj1.c: proj1.h
+endef
+!,
+              '', "#MAKE#: *** prerequisites cannot be defined in recipes.  Stop.\n", 512);
+
+
+# Automatic $$+ variable expansion issue.  Savannah bug #25780
+run_make_test(q!
+all : foo foo
+.SECONDEXPANSION:
+all : $$+ ; @echo '$+'
+foo : ;
+!,
+                  '', "foo foo foo foo\n");
+
+
+# Automatic $$+ variable expansion issue.  Savannah bug #25780
+run_make_test(q!
+all : bar bar
+bar : ;
+q%x : ;
+.SECONDEXPANSION:
+a%l: q1x $$+ q2x ; @echo '$+'
+!,
+                  '', "q1x bar bar q2x bar bar\n");
+
+
 # This tells the test driver that the perl test script executed properly.
 1;

@@ -13 +13 @@
 stamp-*
 makebook*
+
 .*gdbinit
+.gdb_history
+
 *.dep
 *.dvi
@@ -31 +34 @@
 *.pg
 *.pgs
+
 README
 README.DOS
 README.W32
+README.OS2
 aclocal.m4
 autom4te.cache
@@ -52 +57 @@
 config.h.W32
 config.h-vms
+
 loadavg
 loadavg.c
 make
+
 .deps
 .dep_segment
+ID
+TAGS
+
 _*
 sun4
@@ -72 +82 @@
 sol2
 i486-linux
+
 customs
+
 install-sh
 mkinstalldirs
+
+.directive.asc