Merge branch 'fix-tests-empty-regression' into maint

* fix-tests-empty-regression:
  Revert "parallel-tests: avoid command-line length limit issue."

1 files changed, 3 insertions, 8 deletions

diff --git a/automake.in b/automake.in
index 845ac7f67..6b36ae2fc 100755
--- a/automake.in
+++ b/automake.in
@@ -4908,13 +4908,9 @@ sub handle_tests_dejagnu
 }
 
 
-# handle_tests ($MAKEFILE)
-# ------------------------
 # Handle TESTS variable and other checks.
-sub handle_tests ($)
+sub handle_tests
 {
-  my ($makefile) = @_;
-
   if (option 'dejagnu')
     {
       &handle_tests_dejagnu;
@@ -4933,8 +4929,7 @@ sub handle_tests ($)
       push (@check_tests, 'check-TESTS');
       $output_rules .= &file_contents ('check', new Automake::Location,
 				       COLOR => !! option 'color-tests',
-				       PARALLEL_TESTS => !! option 'parallel-tests',
-				       MAKEFILE => basename $makefile);
+				       PARALLEL_TESTS => !! option 'parallel-tests');
 
       # Tests that are known programs should have $(EXEEXT) appended.
       # For matching purposes, we need to adjust XFAIL_TESTS as well.
@@ -8216,7 +8211,7 @@ sub generate_makefile ($$)
   handle_tags;
   handle_minor_options;
   # Must come after handle_programs so that %known_programs is up-to-date.
-  handle_tests ($makefile);
+  handle_tests;
 
   # This must come after most other rules.
   handle_dist;