From: Jim Meyering <jim@meyering.net>
Date: Sun, 22 Dec 1996 03:32:51 +0000 (+0000)
Subject: .
X-Git-Tag: FILEUTILS-3_14a~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a80c49322b9d0424dd8693b21858673bb2688031;p=thirdparty%2Fcoreutils.git

.
---

diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 2597de66b7..ecfce08e27 100644
--- a/tests/join/Makefile.am
+++ b/tests/join/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
-x = join
-
 ##test-files-begin
+x = join
 explicit =
 maint_gen = t1a.in1 t1a.in2 t1a.exp t1b.in1 t1b.in2 t1b.exp t1c.in1 t1c.in2 \
 t1c.exp t1d.in1 t1d.in2 t1d.exp t1e.in1 t1e.in2 t1e.exp t1f.in1 t1f.in2 \
@@ -52,7 +51,10 @@ CLEANFILES = $(run_gen)
 
 @MAINT@rebuild-check: Test.pm mk-script
 @MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' Makefile.am > $$rb; \
+@MAINT@	m_template=../Makefile.am.in; \
+@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+@MAINT@	echo "x = $$tool" >> $$rb; \
 @MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' Makefile.am >> $$rb; \
+@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
 @MAINT@	diff -u Makefile.am $$rb && echo ok || echo no
diff --git a/tests/sort/Makefile.am b/tests/sort/Makefile.am
index 763ccf56f9..9c25e34c63 100644
--- a/tests/sort/Makefile.am
+++ b/tests/sort/Makefile.am
@@ -1,8 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
-x = sort
-
 ##test-files-begin
+x = sort
 explicit =
 maint_gen = t01a.in t01a.exp t02a.in t02a.exp t02b.in t02b.exp t02c.in \
 t02c.exp t02d.in t02d.exp t02e.in t02e.exp t02f.in t02f.exp t03a.in t03a.exp \
@@ -70,7 +69,10 @@ CLEANFILES = $(run_gen)
 
 @MAINT@rebuild-check: Test.pm mk-script
 @MAINT@	rb=rb-check; rm -f $rb; \
-@MAINT@	sed -n '1,/^##test-files-begin/p' Makefile.am > $$rb; \
+@MAINT@	m_template=../Makefile.am.in; \
+@MAINT@	sed -n '1,/^##test-files-begin/p' $$m_template > $$rb; \
+@MAINT@	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
+@MAINT@	echo "x = $$tool" >> $$rb; \
 @MAINT@	./mk-script --list >> $$rb; \
-@MAINT@	sed -n '/^##test-files-end/,$$p' Makefile.am >> $$rb; \
+@MAINT@	sed -n '/^##test-files-end/,$$p' $$m_template >> $$rb; \
 @MAINT@	diff -u Makefile.am $$rb && echo ok || echo no