[Valgrind-valkyrie-dev] valkyrie: r444 - in trunk: . vk_logmerge/tests

[<sv...@va...>]

Author: sewardj
Date: 2008-06-29 23:13:25 +0100 (Sun, 29 Jun 2008)
New Revision: 444

Log:
Make top level 'make regtest' work.


Modified:
   trunk/Makefile.am
   trunk/configure.in
   trunk/vk_logmerge/tests/singlelogfile


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-06-29 22:13:00 UTC (rev 443)
+++ trunk/Makefile.am	2008-06-29 22:13:25 UTC (rev 444)
@@ -12,9 +12,9 @@
 
 
 ## Preprend @PERL@ because tests/vk_regtest isn't executable
-#regtest: check
-#        @PERL@ tests/vk_regtest $(TOOLS)
+regtest: check
+	@PERL@ tests/vk_regtest vk_logmerge
 
 
 EXTRA_DIST = \
-        README_DEVELOPERS
+	README_DEVELOPERS

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-06-29 22:13:00 UTC (rev 443)
+++ trunk/configure.in	2008-06-29 22:13:25 UTC (rev 444)
@@ -140,6 +140,7 @@
 AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_RANLIB
+AC_PATH_PROG(PERL, perl)
 
 
 ########################################################################

Modified: trunk/vk_logmerge/tests/singlelogfile
===================================================================
--- trunk/vk_logmerge/tests/singlelogfile	2008-06-29 22:13:00 UTC (rev 443)
+++ trunk/vk_logmerge/tests/singlelogfile	2008-06-29 22:13:25 UTC (rev 444)
@@ -1,4 +1,4 @@
 #!/bin/bash
 # 'merge' a single xml file - output should be identical to input
 
-../../bin/vk_logmerge ./singlelogfile.stdout.exp
+../vk_logmerge ./singlelogfile.stdout.exp