Clean up some tests for use on Windows.

tests/ChangeLog

@@ -1,5 +1,10 @@
 2013-10-05  Paul Smith  <psmith@gnu.org>
 
+	* test_driver.pl (run_all_tests): Rewrite to be more clear.
+	* scripts/features/jobserver: Avoid using $ENV{HOME} as it doesn't
+	exist everywhere.
+	* scripts/features/default_names: End with 1;
+
 	* scripts/features/loadapi: Use new calling signatures.  Verify
 	the NOEXPAND flag works.  Test with all valid function name
 	characters.

tests/scripts/features/default_names

@@ -40,3 +40,5 @@ if ($case_sensitive) {
     compare_output("It chose Makefile\n",&get_logfile(1));
     unlink("Makefile");
 }
+
+1;

tests/scripts/features/jobserver

@@ -43,10 +43,10 @@ unlink('inc.mk');
 # Or Red Hat bug https://bugzilla.redhat.com/show_bug.cgi?id=885474
 
 open(MAKEFILE,"> Makefile2");
-print MAKEFILE <<EOF;
+print MAKEFILE '
-vpath %.c $ENV{HOME}/
+vpath %.c ../
 foo:
-EOF
+';
 close(MAKEFILE);
 
 run_make_test(q!

tests/test_driver.pl

@@ -202,7 +202,7 @@ sub toplevel
 
   print "\n";
 
-  &run_each_test;
+  run_all_tests();
 
   foreach $dir (@rmdirs)
   {
@@ -415,13 +415,11 @@ sub print_banner
   print "\n";
 }
 
-sub run_each_test
+sub run_all_tests
 {
     $categories_run = 0;
 
-  foreach $testname (sort @TESTS)
+    foreach $testname (sort @TESTS) {
-  {
-    ++$categories_run;
         $suite_passed = 1;       # reset by test on failure
         $num_of_logfiles = 0;
         $num_of_tmpfiles = 0;
@@ -453,7 +451,7 @@ sub run_each_test
         $run_filename = "$testpath.$runext";
         $tmp_filename = "$testpath.$tmpfilesuffix";
 
-    &setup_for_test;          # suite-defined
+        setup_for_test();
 
         $output = "........................................................ ";
 
@@ -461,63 +459,71 @@ sub run_each_test
 
         print $output;
 
-    # Run the actual test!
         $tests_run = 0;
         $tests_passed = 0;
 
+        # Run the test!
         $code = do $perl_testname;
 
+        ++$categories_run;
         $total_tests_run += $tests_run;
         $total_tests_passed += $tests_passed;
 
         # How did it go?
-    if (!defined($code))
+        if (!defined($code)) {
-    {
+            # Failed to parse or called die
-      $suite_passed = 0;
             if (length ($@)) {
                 warn "\n*** Test died ($testname): $@\n";
             } else {
-        warn "\n*** Couldn't run $perl_testname\n";
+                warn "\n*** Couldn't parse $perl_testname\n";
             }
-    }
-    elsif ($code == -1) {
-      $suite_passed = 0;
-    }
-    elsif ($code != 1 && $code != -1) {
-      $suite_passed = 0;
-      warn "\n*** Test returned $code\n";
-    }
-
-    if ($suite_passed) {
-      ++$categories_passed;
-      $status = "ok     ($tests_passed passed)";
-      for ($i = $num_of_tmpfiles; $i; $i--)
-      {
-        &rmfiles ($tmp_filename . &num_suffix ($i) );
-      }
-
-      for ($i = $num_of_logfiles ? $num_of_logfiles : 1; $i; $i--)
-      {
-        &rmfiles ($log_filename . &num_suffix ($i) );
-        &rmfiles ($base_filename . &num_suffix ($i) );
-      }
-    }
-    elsif (!defined $code || $code > 0) {
             $status = "FAILED ($tests_passed/$tests_run passed)";
         }
-    elsif ($code < 0) {
+
+        elsif ($tests_run == 0) {
+            # Nothing was done!!
+            $status = "FAILED (no tests found!)";
+        }
+
+        elsif ($code == -1) {
+            # Skipped... not supported
             $status = "N/A";
             --$categories_run;
         }
 
+        elsif ($code != 1) {
+            # Bad result... this shouldn't really happen.  Usually means that
+            # the suite forgot to end with "1;".
+            warn "\n*** Test returned $code\n";
+            $status = "FAILED ($tests_passed/$tests_run passed)";
+        }
+
+        elsif ($tests_run > $tests_passed) {
+            # Lose!
+            $status = "FAILED ($tests_passed/$tests_run passed)";
+        }
+
+        else {
+            # Win!
+            ++$categories_passed;
+            $status = "ok     ($tests_passed passed)";
+
+            # Clean up
+            for ($i = $num_of_tmpfiles; $i; $i--) {
+                rmfiles($tmp_filename . num_suffix($i));
+            }
+            for ($i = $num_of_logfiles ? $num_of_logfiles : 1; $i; $i--) {
+                rmfiles($log_filename . num_suffix($i));
+                rmfiles($base_filename . num_suffix($i));
+            }
+        }
+
         # If the verbose option has been specified, then a short description
         # of each test is printed before displaying the results of each test
         # describing WHAT is being tested.
 
-    if ($verbose)
+        if ($verbose) {
-    {
+            if ($detail) {
-      if ($detail)
-      {
                 print "\nWHAT IS BEING TESTED\n";
                 print "--------------------";
             }
@@ -528,8 +534,7 @@ sub run_each_test
         # the test is testing what it says it is testing in the verbose output
         # will be displayed here before the results of the test are displayed.
 
-    if ($detail)
+        if ($detail) {
-    {
             print "\nHOW IT IS TESTED\n";
             print "----------------";
             print "\n\n$details\n\n";
@@ -713,7 +718,6 @@ sub compare_output
     &run_command_with_output(&get_difffile,$command);
   }
 
-  $suite_passed = 0;
   return 0;
 }