From: David Levine <levinedl@acm.org>
Date: Thu, 9 Feb 2012 03:41:48 +0000 (-0600)
Subject: Always run setup-test from make test/runalltests, just in case the test build directo... 
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=7b6b5f3f7bf82136c419b08d07304f6af7d76a48;p=mmh

Always run setup-test from make test/runalltests, just in case the test build directory (test/testbuild) isn't up to date.  It might be nice to replace all the copies in the test build directory with symlinks, then make could keep the test build up to date.
---

diff --git a/Makefile.am b/Makefile.am
index ee9b511..42e71fe 100644
--- 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 340be0a..48ba7f1 100755
--- 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`