.

diff --git a/tests/join/Makefile.am b/tests/join/Makefile.am
index 2597de66b77602ffc204a9a254364bf1daca524a..ecfce08e2749adf2581579eebc87838d51c6dfc9 100644 (file)
--- 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 763ccf56f90d458f741ad93c8bf48c1cc51e1948..9c25e34c633d733fc162b8479c2a17dc43e3771b 100644 (file)
--- 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