Changeset 284 in kBuild for branches/GNU/src/gmake/tests/scripts/variables

Timestamp:

May 16, 2005 4:54:08 PM (20 years ago)

Author:

bird

Message:

Current make snaphot, 2005-05-16.

Location:

branches/GNU/src/gmake/tests/scripts/variables

Files:

• MAKE (modified) (2 diffs)
• MAKELEVEL (modified) (2 diffs)
• automatic (modified) (2 diffs)
• flavors (modified) (2 diffs)
• special (modified) (2 diffs)

branches/GNU/src/gmake/tests/scripts/variables/MAKE

@@ +1 @@
+#                                                                    -*-perl-*-
+
 $description = "The following test creates a makefile to test MAKE \n"
               ."(very generic)";
@@ -27 +29 @@
 &run_make_with_options($makefile,"",&get_logfile,0);
 
-&delete("foo");
+&rmfiles("foo");
 # COMPARE RESULTS
 &compare_output($answer,&get_logfile(1));

branches/GNU/src/gmake/tests/scripts/variables/MAKELEVEL

@@ -1 @@
-#                                                               -*-perl-mode-*-
+#                                                                    -*-perl-*-
 
 $description = "The following test creates a makefile to test
@@ -10 +10 @@
 
 print MAKEFILE <<EOF;
-SHELL = /bin/sh
 all:
 \t\@echo MAKELEVEL is \$(MAKELEVEL)

branches/GNU/src/gmake/tests/scripts/variables/automatic

@@ -68 +68 @@
 
 &run_make_with_options($makefile2, "$dir/foo $dir/bar", &get_logfile);
-$answer = ".x\n$dir/foo.x\n\$.x\n\[email protected]\n$dir.x\nfoo.x\n$dir/bar.x\nbar.x\n";
+$answer = ".x\n$dir/foo.x\nx\n\[email protected]\n$dir.x\nfoo.x\n$dir/bar.x\nbar.x\n";
 &compare_output($answer, &get_logfile(1));
 
 &run_make_with_options($makefile2, "$dir/x.z $dir/y.z", &get_logfile);
-$answer = ".x\n$dir/x.z.x\n\$.x\n\[email protected]\n$dir.x\nx.z.x\n.y\n$dir/y.z.y\n\$.y\n\[email protected]\n$dir.y\ny.z.y\n";
+$answer = ".x\n$dir/x.z.x\nx\n\[email protected]\n$dir.x\nx.z.x\n.y\n$dir/y.z.y\n\y\n\[email protected]\n$dir.y\ny.z.y\n";
 &compare_output($answer, &get_logfile(1));
 
@@ -79 +79 @@
 &compare_output($answer, &get_logfile(1));
 
+# TEST #3 -- test for Savannah bug #12320.
+#
+run_make_test('
+.SUFFIXES: .b .src
+
+mbr.b: mbr.src
+        @echo $*
+
+mbr.src: ; @:
+
+',
+'',
+'mbr
+');
+
 1;

branches/GNU/src/gmake/tests/scripts/variables/flavors

@@ -72 +72 @@
 
 &run_make_with_options($makefile, "BOGUS=true", &get_logfile, 512);
-$answer = "$makefile:23: *** empty variable name.  Stop.\n";
+$answer = "$makefile:24: *** empty variable name.  Stop.\n";
 &compare_output($answer, &get_logfile(1));
 
@@ -82 +82 @@
 &compare_output($answer, &get_logfile(1));
 
+# Clean up from "old style" testing.  If all the above tests are converted to
+# run_make_test() syntax than this line can be removed.
+$makefile = undef;
+
+# -------------------------
+# Make sure that prefix characters apply properly to define/endef values.
+#
+# There's a bit of oddness here if you try to use a variable to hold the
+# prefix character for a define.  Even though something like this:
+#
+#       define foo
+#       echo bar
+#       endef
+#
+#       all: ; $(V)$(foo)
+#
+# (where V=@) can be seen by the user to be obviously different than this:
+#
+#       define foo
+#       $(V)echo bar
+#       endef
+#
+#       all: ; $(foo)
+#
+# and the user thinks it should behave the same as when the "@" is literal
+# instead of in a variable, that can't happen because by the time make
+# expands the variables for the command line and sees it begins with a "@" it
+# can't know anymore whether the prefix character came before the variable
+# reference or was included in the first line of the variable reference.
+
+# TEST #5
+# -------
+
+run_make_test('
+define FOO
+$(V1)echo hello
+$(V2)echo world
+endef
+all: ; @$(FOO)
+', '', 'hello
+world');
+
+# TEST #6
+# -------
+
+run_make_test(undef, 'V1=@ V2=@', 'hello
+world');
+
+# TEST #7
+# -------
+
+run_make_test('
+define FOO
+$(V1)echo hello
+$(V2)echo world
+endef
+all: ; $(FOO)
+', 'V1=@', 'hello
+echo world
+world');
+
+# TEST #8
+# -------
+
+run_make_test(undef, 'V2=@', 'echo hello
+hello
+world');
+
+# TEST #9
+# -------
+
+run_make_test(undef, 'V1=@ V2=@', 'hello
+world');
+
+# TEST #10
+# -------
+# Test the basics; a "@" internally to the variable applies to only one line.
+# A "@" before the variable applies to the entire variable.
+
+run_make_test('
+define FOO
+@echo hello
+echo world
+endef
+define BAR
+echo hello
+echo world
+endef
+
+all: foo bar
+foo: ; $(FOO)
+bar: ; @$(BAR)
+', '', 'hello
+echo world
+world
+hello
+world
+');
 
 1;

branches/GNU/src/gmake/tests/scripts/variables/special

@@ -5 +5 @@
 $details = "";
 
-$makefile2 = &get_tmpfile;
-
-
-open(MAKEFILE, "> $makefile");
-
-print MAKEFILE <<'EOF';
+&run_make_test('
 
 X1 := $(sort $(filter FOO BAR,$(.VARIABLES)))
@@ -24 +19 @@
         @echo X2 = $(X2)
         @echo LAST = $(sort $(filter FOO BAR,$(.VARIABLES)))
-
-EOF
-
-close(MAKEFILE);
-
-# TEST #1
-# -------
-
-&run_make_with_options($makefile, "", &get_logfile);
-$answer = "X1 =\nX2 = FOO\nLAST = BAR FOO\n";
-&compare_output($answer, &get_logfile(1));
+',
+               '', "X1 =\nX2 = FOO\nLAST = BAR FOO\n");
 
 
 
-
+# $makefile2 = &get_tmpfile;
 # open(MAKEFILE, "> $makefile2");