Date: Wednesday, May 2, 2007 @ 17:01:04
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: Makefile.am (1.15 -> 1.16) test/Makefile.am (1.15 -> 1.16)
test/ cleanups: test directory now has a default target. Running it
without --enable-cppunit outputs a now related error message. Tests
are compiled at compile time, no more at run time. TESTS_ENABLED
conditional is altering SUBDIRS as seen in the autotools documentation
instead of having the whole sub Makefile inside a if clause.
------------------+
Makefile.am | 4 ++++
test/Makefile.am | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
Index: libmysequoia/Makefile.am
diff -u libmysequoia/Makefile.am:1.15 libmysequoia/Makefile.am:1.16
--- libmysequoia/Makefile.am:1.15 Fri Apr 6 15:33:16 2007
+++ libmysequoia/Makefile.am Wed May 2 17:01:04 2007
@@ -18,7 +18,11 @@
# Contributor(s):
#
+if TESTS_ENABLED
SUBDIRS = src test
+else
+SUBDIRS = src
+endif
EXTRA_DIST = config/mysql.sh config/createtbl.sh \
config/controller/*.xml config/virtualdatabase/*.xml \
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.15 libmysequoia/test/Makefile.am:1.16
--- libmysequoia/test/Makefile.am:1.15 Thu Mar 22 19:29:27 2007
+++ libmysequoia/test/Makefile.am Wed May 2 17:01:04 2007
@@ -20,9 +20,8 @@
# Makefile for LibMySequoia and tests
#
-if TESTS_ENABLED
-check_PROGRAMS = runTests
+noinst_PROGRAMS = runTests
runTests_SOURCES = runTests.cpp \
TestCarobMySQL.cpp \
@@ -33,7 +32,7 @@
runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @GCOV_CFLAGS@ @PROFILE_CFLAGS@
runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @PROFILE_LDADD@
-TESTS = $(check_PROGRAMS)
+TESTS = $(noinst_PROGRAMS)
EXTRA_DIST = Globals.hpp \
TestCarobMySQL.hpp \
@@ -44,4 +43,3 @@
clean-local:
rm -f *.gcno *.gcda
-endif
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
