.

12 files changed, 76 insertions, 29 deletions

diff --git a/tests/cut/Makefile.in b/tests/cut/Makefile.in
index 2f9ebb976..9a37954e9 100644
--- a/tests/cut/Makefile.in
+++ b/tests/cut/Makefile.in
@@ -290,6 +290,9 @@ out-delim6.O out-delim6.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -521,8 +524,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/date/Makefile.in b/tests/date/Makefile.in
index 5c70ede63..192e22397 100644
--- a/tests/date/Makefile.in
+++ b/tests/date/Makefile.in
@@ -294,6 +294,9 @@ ns-relative.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -525,8 +528,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/head/Makefile.in b/tests/head/Makefile.in
index 3bafdd1d8..61243fc07 100644
--- a/tests/head/Makefile.in
+++ b/tests/head/Makefile.in
@@ -281,6 +281,9 @@ posix-3.O posix-3.E posix-4.O posix-4.E posix-5.O posix-5.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -512,8 +515,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/join/Makefile.in b/tests/join/Makefile.in
index 0e8815f42..2a54a77c5 100644
--- a/tests/join/Makefile.in
+++ b/tests/join/Makefile.in
@@ -285,6 +285,9 @@ invalid-j.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -516,8 +519,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/pr/Makefile.in b/tests/pr/Makefile.in
index ad86ec9ec..289259e25 100644
--- a/tests/pr/Makefile.in
+++ b/tests/pr/Makefile.in
@@ -334,6 +334,9 @@ dbl-sp-a.E dbl-sp-b.O dbl-sp-b.E narrow-1.O narrow-1.E col-last.O col-last.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -565,8 +568,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/sort/Makefile.in b/tests/sort/Makefile.in
index c1f07bc0f..b3ecaeb77 100644
--- a/tests/sort/Makefile.in
+++ b/tests/sort/Makefile.in
@@ -306,6 +306,9 @@ nul-nls.E use-nl.O use-nl.E o2.O o2.E nul-tab.O nul-tab.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -537,8 +540,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/tac/Makefile.in b/tests/tac/Makefile.in
index 7af657e3a..44451a714 100644
--- a/tests/tac/Makefile.in
+++ b/tests/tac/Makefile.in
@@ -282,6 +282,9 @@ opt-br.O opt-br.E opt-br2.O opt-br2.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -513,8 +516,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/tail/Makefile.in b/tests/tail/Makefile.in
index 6da4d9d4e..ca1a1aeef 100644
--- a/tests/tail/Makefile.in
+++ b/tests/tail/Makefile.in
@@ -284,6 +284,9 @@ n-5.E n-5a.O n-5a.E n-5b.O n-5b.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -515,8 +518,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/test/Makefile.in b/tests/test/Makefile.in
index c428b440c..18af7025b 100644
--- a/tests/test/Makefile.in
+++ b/tests/test/Makefile.in
@@ -360,6 +360,9 @@ paren-4.O paren-4.E paren-5.O paren-5.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -591,8 +594,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/tr/Makefile.in b/tests/tr/Makefile.in
index 34ab3bfa2..778ef33d7 100644
--- a/tests/tr/Makefile.in
+++ b/tests/tr/Makefile.in
@@ -273,7 +273,8 @@ rep-cclass.X rep-1.I rep-1.X rep-2.I rep-2.X rep-3.I rep-3.X o-rep-1.I \
 o-rep-1.X o-rep-2.I o-rep-2.X esc.I esc.X ross-0a.I ross-0a.X ross-0b.I \
 ross-0b.X ross-1a.I ross-1a.X ross-1b.I ross-1b.X ross-2.I ross-2.X ross-3.I \
 ross-3.X ross-4.I ross-4.X ross-5.I ross-5.X ross-6.I ross-6.X empty-eq.I \
-empty-eq.X empty-cc.I empty-cc.X
+empty-eq.X empty-cc.I empty-cc.X repeat-bs-9.I repeat-bs-9.X repeat-0.I \
+repeat-0.X repeat-000.I repeat-000.X repeat-compl.I repeat-compl.X
 
 run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E 8.O 8.E 9.O \
 9.E a.O a.E b.O b.E c.O c.E d.O d.E e.O e.E f.O f.E g.O g.E h.O h.E i.O i.E \
@@ -284,18 +285,19 @@ rep-cclass.E rep-1.O rep-1.E rep-2.O rep-2.E rep-3.O rep-3.E o-rep-1.O \
 o-rep-1.E o-rep-2.O o-rep-2.E esc.O esc.E ross-0a.O ross-0a.E ross-0b.O \
 ross-0b.E ross-1a.O ross-1a.E ross-1b.O ross-1b.E ross-2.O ross-2.E ross-3.O \
 ross-3.E ross-4.O ross-4.E ross-5.O ross-5.E ross-6.O ross-6.E empty-eq.O \
-empty-eq.E empty-cc.O empty-cc.E
+empty-eq.E empty-cc.O empty-cc.E repeat-bs-9.O repeat-bs-9.E repeat-0.O \
+repeat-0.E repeat-000.O repeat-000.E repeat-compl.O repeat-compl.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
 MAINTAINERCLEANFILES = $x-tests $(maint_gen)
 CLEANFILES = $(run_gen)
-TESTS_ENVIRONMENT = \
-  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
-
 all: all-am
 
 .SUFFIXES:
@@ -522,8 +524,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/uniq/Makefile.in b/tests/uniq/Makefile.in
index b8c66db67..9c2a4403f 100644
--- a/tests/uniq/Makefile.in
+++ b/tests/uniq/Makefile.in
@@ -286,6 +286,9 @@ obs45.E 50.O 50.E 51.O 51.E 52.O 52.E 53.O 53.E 54.O 54.E 55.O 55.E 56.O 56.E \
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -517,8 +520,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@
 
diff --git a/tests/wc/Makefile.in b/tests/wc/Makefile.in
index 5ae2c6f51..453f1b985 100644
--- a/tests/wc/Makefile.in
+++ b/tests/wc/Makefile.in
@@ -274,6 +274,9 @@ c2.O c2.E
 
 EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
 noinst_SCRIPTS = $x-tests
+TESTS_ENVIRONMENT = \
+  PATH="`pwd`/../../src$(PATH_SEPARATOR)$$PATH"
+
 editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,$(srcdir),g'
 TESTS = $x-tests
 mk_script = $(srcdir)/../mk-script
@@ -505,8 +508,9 @@ uninstall-am: uninstall-info-am
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am uninstall-info-am
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) ../../src/$x > $@.n
+$(srcdir)/$x-tests: $(mk_script) Test.pm Makefile.am
+	test '$x' = test && prog=../../src/$x || prog=$x; \
+	$(PERL) -I$(srcdir) -w -- $(mk_script) $(srcdir) $$prog > $@.n
 	mv $@.n $@
 	chmod 755 $@