Always run setup-test from make test/runalltests, just in case the test build directo...

diff --git a/Makefile.am b/Makefile.am
index ee9b511053c7c5bb38566462f093b3135523d137..42e71fedadcd7894111403bbc133f4f82d816b5b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -500,7 +500,6 @@ man/man.sed: Makefile
        $(SED) -f man/man.sed $< > $@
 
 test: all
-       @test -d $(testdir)/testinstall || $(testdir)/setup-test
        @$(testdir)/runalltests
 .PHONY: test
 

diff --git a/test/runalltests b/test/runalltests
index 340be0a46e06832e39d6cc49cba09593c35685c0..48ba7f1cdaabadc1a791bda217e867a606cf18bb 100755 (executable)
--- a/test/runalltests
+++ b/test/runalltests
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-status=0
-
 # Get full pathnames that we'll need.
 cd `dirname $0`
 testdir=`pwd`
 
-test -d testinstall || ./setup-test
+# Always run setup-test in case the code or configuration has changed.
+./setup-test
+
+status=0
 
 # Note that we ignore *~ files as these are probably editor backups.
 for i in `find . -name 'test-*[!~]' -type f`