(TESTS_ENVIRONMENT): Define PATH to include

the build src/ directory -- at the front.
($(srcdir)/$x-tests): Depend on Makefile.am.
Use $x as the program name, except when it would be `test' (test is
the sole program tested via mk-script that is also a shell built-in).
In that case, use the old ../../src/$x.

diff --git a/tests/Makefile.am.in b/tests/Makefile.am.in
index a0a1001e7ea5b8217aec14b78ab306b6f041b441..23f2cfaa47b11ec22914dc6eb23fc97b8b105243 100644 (file)
--- a/tests/Makefile.am.in
+++ b/tests/Makefile.am.in
@@ -5,14 +5,17 @@
 
 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
-$(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 $@