* Some final cleanups, and release 3.79.3.79

2 files changed, 32 insertions, 33 deletions

diff --git a/tests/scripts/functions/word b/tests/scripts/functions/word
index f786e47..36e5102 100644
--- a/tests/scripts/functions/word
+++ b/tests/scripts/functions/word
@@ -1,33 +1,33 @@
-$description = "The following test creates a makefile to test the word, words,\n"
-              ."and wordlist functions.\n";
+#                                                                    -*-perl-*-
+$description = "Test the word, words, and wordlist functions.\n";
 
-$details = "The word function will return the number of words in a variable or\n"
-          ."the word specified. The test will produce a variable with a large\n"
-          ."number of words in it, determine the number of word and then read\n"
-          ."each one back.\n";
+$details = "\
+Produce a variable with a large number of words in it,
+determine the number of words, and then read each one back.\n";
 
 open(MAKEFILE,"> $makefile");
 
 # The Contents of the MAKEFILE ...
 
-print MAKEFILE "string  := word.pl general_test2.pl   FORCE.pl word.pl generic_test.perl MAKEFILES_variable.pl \n"
-              ."string2 := \$(string) \$(string) \$(string) \$(string) \$(string) \$(string) \$(string)\n"
-              ."string3 := \$(string2) \$(string2) \$(string2) \$(string2) \$(string2) \$(string2) \$(string2)\n"
-              ."string4 := \$(string3) \$(string3) \$(string3) \$(string3) \$(string3) \$(string3) \$(string3)\n"
-              ."all: \n"
-              ."\t\@echo \$(words \$(string)) \n"
-              ."\t\@echo \$(words \$(string4)) \n"
-              ."\t\@echo \$(word 1, \$(string)) \n"
-              ."\t\@echo \$(word 100, \$(string)) \n"
-              ."\t\@echo \$(word 1, \$(string)) \n"
-              ."\t\@echo \$(word 1000, \$(string3)) \n"
-              ."\t\@echo \$(wordlist 3, 4, \$(string)) \n"
-              ."\t\@echo \$(wordlist 4, 3, \$(string)) \n"
-              ."\t\@echo \$(wordlist 1, 6, \$(string)) \n"
-              ."\t\@echo \$(wordlist 7, 5, \$(string)) \n"
-              ."\t\@echo \$(wordlist 100, 110, \$(string)) \n"
-              ."\t\@echo \$(wordlist 7, 10, \$(string2)) \n"
-;
+print MAKEFILE <<'EOF';
+string  := word.pl general_test2.pl   FORCE.pl word.pl generic_test.perl MAKEFILES_variable.pl
+string2 := $(string) $(string) $(string) $(string) $(string) $(string) $(string)
+string3 := $(string2) $(string2) $(string2) $(string2) $(string2) $(string2) $(string2)
+string4 := $(string3) $(string3) $(string3) $(string3) $(string3) $(string3) $(string3)
+all:
+	@echo $(words $(string))
+	@echo $(words $(string4))
+	@echo $(word 1, $(string))
+	@echo $(word 100, $(string))
+	@echo $(word 1, $(string))
+	@echo $(word 1000, $(string3))
+	@echo $(wordlist 3, 4, $(string))
+	@echo $(wordlist 4, 3, $(string))
+	@echo $(wordlist 1, 6, $(string))
+	@echo $(wordlist 5, 7, $(string))
+	@echo $(wordlist 100, 110, $(string))
+	@echo $(wordlist 7, 10, $(string2))
+EOF
 
 
 
@@ -35,7 +35,7 @@ print MAKEFILE "string  := word.pl general_test2.pl   FORCE.pl word.pl generic_t
 
 close(MAKEFILE);
 
-&run_make_with_options($makefile,"",&get_logfile,0);
+&run_make_with_options($makefile, "", &get_logfile);
 
 # Create the answer to what should be produced by this Makefile
 
@@ -47,7 +47,7 @@ $answer = "6\n"
          ."word.pl\n"
          ."\n"
 	 ."FORCE.pl word.pl\n"
-	 ."FORCE.pl word.pl\n"
+	 ."\n"
 	 ."word.pl general_test2.pl FORCE.pl word.pl generic_test.perl MAKEFILES_variable.pl\n"
 	 ."generic_test.perl MAKEFILES_variable.pl\n"
 	 ."\n"
@@ -58,13 +58,7 @@ $answer = "6\n"
 # to send the name of the last logfile created.  You may also use
 # the special call &get_logfile(1) which returns the same as &get_logfile(1).
 
-&compare_output($answer,&get_logfile(1));
+&compare_output($answer, &get_logfile(1));
 
 # This tells the test driver that the perl test script executed properly.
 1;
-
-
-
-
-
-
diff --git a/tests/scripts/options/dash-n b/tests/scripts/options/dash-n
index 98f1d21..35f317d 100644
--- a/tests/scripts/options/dash-n
+++ b/tests/scripts/options/dash-n
@@ -50,6 +50,11 @@ EOF
 close(MAKEFILE);
 
 &touch('b');
+# Sometimes, on my Solaris 2.5.1 box with a NetApp filesystem NFS-mounted,
+# just touching b first then a isn't good enough: the nsec field in the
+# stat result shows b is _newer_ than a once every 5 or 6 tries!!!  I've
+# no idea what this is about, but that's why there's a sleep(1) here...
+sleep(1);
 &touch('a');
 sleep(1);
 &touch('c');