A few test bug fixes:

  * Never use "touch" in make rules; it breaks on most sub-second
    supporting systems.  Use echo "" > $@ instead.
  * Forgot to close test makefiles before using them!

All the above worked fine on Linux but failed miserably on Solaris.

4 files changed, 9 insertions, 4 deletions

diff --git a/tests/scripts/features/conditionals b/tests/scripts/features/conditionals
index ab3d9d5..9aad1d1 100644
--- a/tests/scripts/features/conditionals
+++ b/tests/scripts/features/conditionals
@@ -51,7 +51,6 @@ close(MAKEFILE);
 
 &run_make_with_options($makefile,"",&get_logfile,0);
 
-# Create the answer to what should be produced by this Makefile
 $answer = "arg1 NOT equal arg2
 arg2 equals arg5
 arg3 NOT equal arg4
@@ -59,8 +58,6 @@ variable is undefined
 arg4 is defined
 ";
 
-# COMPARE RESULTS
-
 &compare_output($answer,&get_logfile(1));
 
 
@@ -92,6 +89,8 @@ all:; @echo DEF=$(DEF) DEF2=$(DEF2)
 
 EOF
 
+close(MAKEFILE)
+
 &run_make_with_options($makefile2,"",&get_logfile,0);
 $answer = "DEF=yes DEF2=yes\n";
 &compare_output($answer,&get_logfile(1));
diff --git a/tests/scripts/features/export b/tests/scripts/features/export
index 09aeac2..3d630a4 100644
--- a/tests/scripts/features/export
+++ b/tests/scripts/features/export
@@ -131,6 +131,8 @@ all:
 
 EOF
 
+close(MAKEFILE);
+
 &run_make_with_options($makefile2,"",&get_logfile,0);
 $answer = "foo=f-ok bar=b-ok\nfoo=f-ok bar=b-ok\n";
 &compare_output($answer,&get_logfile(1));
@@ -164,6 +166,8 @@ all:
 
 EOF
 
+close(MAKEFILE);
+
 &run_make_with_options($makefile3,"",&get_logfile,0);
 $answer = "foo=f-ok bar=b-ok\nfoo= bar=\n";
 &compare_output($answer,&get_logfile(1));
diff --git a/tests/scripts/options/dash-B b/tests/scripts/options/dash-B
index 94932e5..32992b3 100644
--- a/tests/scripts/options/dash-B
+++ b/tests/scripts/options/dash-B
@@ -18,7 +18,7 @@ all: foo
 
 foo: bar.x
 	@echo cp $< $@
-	@touch $@
+	@echo "" > $@
 EOF
 
 close(MAKEFILE);
diff --git a/tests/scripts/variables/automatic b/tests/scripts/variables/automatic
index cb17efe..42e8cba 100644
--- a/tests/scripts/variables/automatic
+++ b/tests/scripts/variables/automatic
@@ -62,6 +62,8 @@ $(dir)/foo $(dir)/bar: $@.x $$@.x $$$@.x $$$$@.x $$(@D).x $$(@F).x
 $(dir)/x.z $(dir)/y.z: $(dir)/%.z : $@.% $$@.% $$$@.% $$$$@.% $$(@D).% $$(@F).%
 EOF
 
+close(MAKEFILE);
+
 &run_make_with_options($makefile2, "$dir/foo $dir/bar", &get_logfile);
 $answer = ".x\n$dir/foo.x\n\$.x\n\$@.x\n$dir.x\nfoo.x\n$dir/bar.x\nbar.x\n";
 &compare_output($answer, &get_logfile(1));