Changeset 153 for branches/GNU/src/gmake/tests

Timestamp:

Sep 8, 2004, 4:43:30 AM (21 years ago)

Author:

bird

Message:

GNU Make 3.81beta1.

Location:

branches/GNU/src/gmake/tests

Files:

• ChangeLog (modified) (1 diff)
• scripts/features/conditionals (modified) (2 diffs)
• scripts/features/order_only (modified) (1 diff)
• scripts/functions/origin (modified) (3 diffs)

branches/GNU/src/gmake/tests/ChangeLog

@@ +1 @@
+2004-02-21  Paul D. Smith  <psmith@gnu.org>
+
+        * scripts/functions/origin: Set our own environment variable
+        rather than relying on $HOME.
+
+2004-01-21  Paul D. Smith  <psmith@gnu.org>
+
+        * scripts/features/conditionals: Test arguments to ifn?def which
+        contain whitespace (such as a function that is evaluated).  Bug
+        #7257.
+
+2004-01-07  Paul D. Smith  <psmith@gnu.org>
+
+        * scripts/features/order_only: Test order-only prerequisites in
+        pattern rules (patch #2349).
+
 2003-11-02  Paul D. Smith  <psmith@gnu.org>
 

branches/GNU/src/gmake/tests/scripts/features/conditionals

@@ -86 +86 @@
 endif
 
-all:; @echo DEF=$(DEF) DEF2=$(DEF2)
+
+DEF3 = no
+FUNC = $1
+ifdef $(call FUNC,DEF)3
+  DEF3 = yes
+endif
+
+all:; @echo DEF=$(DEF) DEF2=$(DEF2) DEF3=$(DEF3)
 
 EOF
@@ -93 +100 @@
 
 &run_make_with_options($makefile2,"",&get_logfile,0);
-$answer = "DEF=yes DEF2=yes\n";
+$answer = "DEF=yes DEF2=yes DEF3=yes\n";
 &compare_output($answer,&get_logfile(1));
 

branches/GNU/src/gmake/tests/scripts/features/order_only

@@ -110 +110 @@
 unlink(qw(foo baz));
 
+# Test order-only in pattern rules
+
+$makefile4 = &get_tmpfile;
+
+open(MAKEFILE,"> $makefile4");
+
+print MAKEFILE <<'EOF';
+%.w : %.x | baz
+        @echo '$$^ = $^'
+        @echo '$$| = $|'
+        touch $@
+
+all: foo.w
+
+.PHONY: baz
+foo.x baz:
+        touch $@
+EOF
+
+close(MAKEFILE);
+
+# TEST #7 -- make sure the parser was correct.
+
+&run_make_with_options($makefile4, "", &get_logfile);
+$answer = "touch foo.x\ntouch baz\n\$^ = foo.x\n\$| = baz\ntouch foo.w\n";
+&compare_output($answer,&get_logfile(1));
+
+# TEST #8 -- now we do it again: this time foo.w won't be built
+
+&run_make_with_options($makefile4, "", &get_logfile);
+$answer = "touch baz\n";
+&compare_output($answer,&get_logfile(1));
+
+unlink(qw(foo.w foo.x baz));
+
 1;

branches/GNU/src/gmake/tests/scripts/functions/origin

@@ -16 +16 @@
 'automatic'            Automatic variable\n";
 
-# On WIN32 systems, HOME is meaningless. SystemRoot should be defined
-# though.  With DJGPP, HOME is not guaranteed to be defined.  Use DJDIR
-# instead.
-#
-$homevar = (($port_type eq 'Windows') ? "SystemRoot"
-            : (($port_type eq 'DOS') ? "DJDIR"
-               : "HOME"));
+# Set an environment variable
+$ENV{MAKETEST} = 1;
 
 open(MAKEFILE,"> $makefile");
@@ -28 +23 @@
 print MAKEFILE <<EOF;
 foo := bletch garf
-auto_var = udef CC $homevar MAKE foo CFLAGS WHITE \@
+auto_var = udef CC MAKETEST MAKE foo CFLAGS WHITE \@
 av = \$(foreach var, \$(auto_var), \$(origin \$(var)) )
 override WHITE := BLACK
@@ -34 +29 @@
 \t\@echo \$(origin undefined)
 \t\@echo \$(origin CC)
-\t\@echo \$(origin $homevar)
+\t\@echo \$(origin MAKETEST)
 \t\@echo \$(origin MAKE)
 \t\@echo \$(origin foo)