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

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

Author: sewardj
Date: 2008-06-30 08:20:18 +0100 (Mon, 30 Jun 2008)
New Revision: 447

Log:
More vk_logmerge/tests build system unbreakage.


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


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-06-30 06:45:36 UTC (rev 446)
+++ trunk/configure.in	2008-06-30 07:20:18 UTC (rev 447)
@@ -220,6 +220,7 @@
    Makefile
    valkyrie/Makefile
    vk_logmerge/Makefile
+   vk_logmerge/tests/Makefile
    doc/Makefile
    doc/images/Makefile
    tests/Makefile

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2008-06-30 06:45:36 UTC (rev 446)
+++ trunk/tests/Makefile.am	2008-06-30 07:20:18 UTC (rev 447)
@@ -2,7 +2,7 @@
 
 noinst_SCRIPTS = \
 	vk_regtest \
-	filter_addresses
+	filter_addresses \
 	filter_libc \
 	filter_sink \
 	filter_test_paths \

Modified: trunk/vk_logmerge/Makefile.am
===================================================================
--- trunk/vk_logmerge/Makefile.am	2008-06-30 06:45:36 UTC (rev 446)
+++ trunk/vk_logmerge/Makefile.am	2008-06-30 07:20:18 UTC (rev 447)
@@ -8,6 +8,8 @@
 QT_UIC = @QT_UIC@
 QT_DIR = @QT_DIR@
 
+SUBDIRS = tests
+
 ########################################################################
 # Build vk_logmerge
 #

Added: trunk/vk_logmerge/tests/Makefile.am
===================================================================
--- trunk/vk_logmerge/tests/Makefile.am	                        (rev 0)
+++ trunk/vk_logmerge/tests/Makefile.am	2008-06-30 07:20:18 UTC (rev 447)
@@ -0,0 +1,5 @@
+noinst_SCRIPTS = filter_stderr
+
+EXTRA_DIST = $(noinst_SCRIPTS) \
+	singlelogfile singlelogfile.vgtest \
+	singlelogfile.stderr.exp singlelogfile.stdout.exp