.

15 files changed, 735 insertions, 690 deletions

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index fecfbf7e4..a02e8fb8f 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -176,54 +176,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index b5f0b7607..4c089bca4 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -173,54 +173,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 40c900897..30feac987 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -176,54 +176,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index fc2d15db7..add8f1e85 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -152,54 +152,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index e559befd3..3f9e4349a 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -226,54 +226,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index de75b998a..1848109fb 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -196,54 +196,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/sum/Makefile.in b/tests/sum/Makefile.in
index 80e3230da..0c5e3fd4a 100644
--- a/tests/sum/Makefile.in
+++ b/tests/sum/Makefile.in
@@ -152,54 +152,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index e232113d0..f903d0816 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -174,54 +174,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/tail-2/Makefile.in b/tests/tail-2/Makefile.in
index f11dd04b9..5583ff212 100644
--- a/tests/tail-2/Makefile.in
+++ b/tests/tail-2/Makefile.in
@@ -152,54 +152,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 53f73463d..dfd8e6611 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -176,54 +176,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index cc97c0ae4..e3a449140 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -178,54 +178,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/tsort/Makefile.in b/tests/tsort/Makefile.in
index 5b694e836..93a6bedb6 100644
--- a/tests/tsort/Makefile.in
+++ b/tests/tsort/Makefile.in
@@ -152,54 +152,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/unexpand/Makefile.in b/tests/unexpand/Makefile.in
index 9bb13faac..0442cbd47 100644
--- a/tests/unexpand/Makefile.in
+++ b/tests/unexpand/Makefile.in
@@ -152,54 +152,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index 567e01358..c1cb0ce54 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -172,54 +172,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index 1c457efa1..99dd522d0 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -166,54 +166,57 @@ TAGS:
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; \
 	srcdir=$(srcdir); export srcdir; \
-	for tst in $(TESTS); do \
-	  if test -f ./$$tst; then dir=./; \
-	  elif test -f $$tst; then dir=; \
-	  else dir="$(srcdir)/"; fi; \
-	  if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xpass=`expr $$xpass + 1`; \
-	      failed=`expr $$failed + 1`; \
-	      echo "XPASS: $$tst"; \
-	    ;; \
-	    *) \
-	      echo "PASS: $$tst"; \
-	    ;; \
-	    esac; \
-	  elif test $$? -ne 77; then \
-	    all=`expr $$all + 1`; \
-	    case " $(XFAIL_TESTS) " in \
-	    *" $$tst "*) \
-	      xfail=`expr $$xfail + 1`; \
-	      echo "XFAIL: $$tst"; \
-	    ;; \
-	    *) \
-	      failed=`expr $$failed + 1`; \
-	      echo "FAIL: $$tst"; \
-	    ;; \
-	    esac; \
-	  fi; \
-	done; \
-	if test "$$failed" -eq 0; then \
-	  if test "$$xfail" -eq 0; then \
-	    banner="All $$all tests passed"; \
-	  else \
-	    banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	  fi; \
-	else \
-	  if test "$$xpass" -eq 0; then \
-	    banner="$$failed of $$all tests failed"; \
+	list='$(TESTS)'; \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xpass=`expr $$xpass + 1`; \
+	        failed=`expr $$failed + 1`; \
+	        echo "XPASS: $$tst"; \
+	      ;; \
+	      *) \
+	        echo "PASS: $$tst"; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *" $$tst "*) \
+	        xfail=`expr $$xfail + 1`; \
+	        echo "XFAIL: $$tst"; \
+	      ;; \
+	      *) \
+	        failed=`expr $$failed + 1`; \
+	        echo "FAIL: $$tst"; \
+	      ;; \
+	      esac; \
+	    fi; \
+	  done; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="All $$all tests passed"; \
+	    else \
+	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	    fi; \
 	  else \
-	    banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all tests failed"; \
+	    else \
+	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	    fi; \
 	  fi; \
-	fi; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"; \
-	test "$$failed" -eq 0
+	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  echo "$$dashes"; \
+	  echo "$$banner"; \
+	  echo "$$dashes"; \
+	  test "$$failed" -eq 0; \
+	fi
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)