From 5dabe472b07c1962783838ed83ec8fcd1faa4389 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 20 Oct 2007 10:07:12 +0200
Subject: Adjust tests to pass, now that Test.pm ones use check.mk.

* tests/check.mk (vc_exe_in_TESTS): Adjust regexp not to match the
"TESTS = $x-tests" line in each Test.pm-derived Makefile.am file.
* tests/sort/main: Remove this unused file.
---
 ChangeLog       |  5 +++++
 tests/check.mk  | 20 +++++++++++---------
 tests/sort/main |  3 ---
 3 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100755 tests/sort/main

diff --git a/ChangeLog b/ChangeLog
index a6e190fd4..d025e231e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-10-20  Jim Meyering  <meyering@redhat.com>
 
+	Adjust tests to pass, now that Test.pm ones use check.mk.
+	* tests/check.mk (vc_exe_in_TESTS): Adjust regexp not to match the
+	"TESTS = $x-tests" line in each Test.pm-derived Makefile.am file.
+	* tests/sort/main: Remove this unused file.
+
 	Ensure that Test.pm-derived tests use the right $PATH.
 	* tests/Makefile.am.in: Include $(top_srcdir)/tests/check.mk.
 
diff --git a/tests/check.mk b/tests/check.mk
index aad6433db..39b094dc1 100644
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -15,17 +15,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure that all version-controlled executable files are listed in TESTS.
+# Collect test names from the line matching /^TESTS = \\$$/ to the following
+# one that does not end in '\'.
 _v = TESTS
 vc_exe_in_TESTS: Makefile
-	@if test -d $(top_srcdir)/.git; then			\
-	  sed -n '/^$(_v) =/,/[^\]$$/p' $(srcdir)/Makefile.am	\
-	    | sed 's/^  *//;/^\$$.*/d;/^$(_v) =/d'		\
-	    | tr -s '\012\\' '  ' | fmt -1 | sort -u > t1 &&	\
-	  for f in `$(top_srcdir)/build-aux/vc-list-files .`; do \
-	    test -f "$$f" && test -x "$$f" && echo "$$f";	\
-	  done | sort -u > t2 &&				\
-	  diff -u t1 t2 || exit 1;				\
-	  rm -f t1 t2;						\
+	@if test -d $(top_srcdir)/.git; then				\
+	  sed -n '/^$(_v) = \\$$/,/[^\]$$/p' $(srcdir)/Makefile.am	\
+	    | sed 's/^  *//;/^\$$.*/d;/^$(_v) =/d'			\
+	    | tr -s '\012\\' '  ' | fmt -1 | sort -u > t1 &&		\
+	  for f in `$(top_srcdir)/build-aux/vc-list-files .`; do	\
+	    test -f "$$f" && test -x "$$f" && echo "$$f";		\
+	  done | sort -u > t2 &&					\
+	  diff -u t1 t2 || exit 1;					\
+	  rm -f t1 t2;							\
 	else :; fi
 
 check: vc_exe_in_TESTS
diff --git a/tests/sort/main b/tests/sort/main
deleted file mode 100755
index dd2da71f4..000000000
--- a/tests/sort/main
+++ /dev/null
@@ -1,3 +0,0 @@
-:
-perl -pe 's/\\\n$//' "$@" \
-    | ./build-script
-- 
cgit v1.2.3-54-g00ecf