[cig-commits] r13621 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:16:17 -0800 (Tue, 09 Dec 2008)
New Revision: 13621

Modified:
   cs/cigma/trunk/Makefile.am
   cs/cigma/trunk/configure.ac
Log:
Enable tests conditionally (using flag --enable-testing)

Modified: cs/cigma/trunk/Makefile.am
===================================================================
--- cs/cigma/trunk/Makefile.am	2008-12-10 02:16:15 UTC (rev 13620)
+++ cs/cigma/trunk/Makefile.am	2008-12-10 02:16:17 UTC (rev 13621)
@@ -32,6 +32,7 @@
 ANN_FLAGS = -I$(top_srcdir)/src/contrib/ann/include
 
 # Select logging method for cxxtl
+# XXX: determine these from a ./configure option
 #LOGGER_FLAGS = -DTLOG
 LOGGER_FLAGS = -DETLOG
 #LOGGER_FLAGS = -DFTLOG=cigma
@@ -356,44 +357,55 @@
 
 
 # Compile this as part of make check
-check_PROGRAMS = cigma-test
+check_PROGRAMS =
 
 # Also run the tests as part of make check
 TESTS =
-TESTS += cigma-test
-TESTS += $(top_srcdir)/tests/pytests/runner.py
-TESTS +=$(top_srcdir)/tests/system/runner.py
 
+if ENABLE_TESTING
 
+  check_PROGRAMS += cigma-test
+
+  TESTS += cigma-test
+  TESTS += $(top_srcdir)/tests/pytests/runner.py
+  TESTS += $(top_srcdir)/tests/system/runner.py
+
+  cigma_test_CXXFLAGS = $(cigma_test_cxxflags)
+  cigma_test_LDFLAGS  = $(cigma_test_ldflags)
+  cigma_test_LDADD    = $(cigma_test_ldadd)
+  cigma_test_SOURCES  = $(cigma_test_sources)
+
+endif
+
 # cigma tests {{{
 
 ## Compiler/Linker Options
 
-cigma_test_CXXFLAGS =
-cigma_test_CXXFLAGS += $(CPPUNIT_CFLAGS)
-cigma_test_CXXFLAGS += $(BOOST_CPPFLAGS)
-cigma_test_CXXFLAGS += $(ANN_FLAGS)
-cigma_test_CXXFLAGS += $(HDF5_INCLUDES)
-cigma_test_CXXFLAGS += $(VTK_INCLUDES)
-cigma_test_CXXFLAGS += -I$(top_srcdir)/src
-cigma_test_CXXFLAGS += -I$(top_srcdir)/tests
+cigma_test_cxxflags =
+cigma_test_cxxflags += $(CPPUNIT_CFLAGS)
+cigma_test_cxxflags += $(BOOST_CPPFLAGS)
+cigma_test_cxxflags += $(ANN_FLAGS)
+cigma_test_cxxflags += $(HDF5_INCLUDES)
+cigma_test_cxxflags += $(VTK_INCLUDES)
+cigma_test_cxxflags += -I$(top_srcdir)/src
+cigma_test_cxxflags += -I$(top_srcdir)/tests
 
-cigma_test_LDFLAGS =
-cigma_test_LDFLAGS += $(BOOST_LDFLAGS)
-cigma_test_LDFLAGS += $(HDF5_LDFLAGS)
-cigma_test_LDFLAGS += $(VTK_LDFLAGS)
+cigma_test_ldflags =
+cigma_test_ldflags += $(BOOST_LDFLAGS)
+cigma_test_ldflags += $(HDF5_LDFLAGS)
+cigma_test_ldflags += $(VTK_LDFLAGS)
 
 
-cigma_test_LDADD =
-cigma_test_LDADD += $(CPPUNIT_LIBS)
-cigma_test_LDADD += libcigma.a
-cigma_test_LDADD += libann.a
-cigma_test_LDADD += $(HDF5_LIBS)
-cigma_test_LDADD += $(VTK_LIBS)
-cigma_test_LDADD += $(BOOST_SYSTEM_LIB)
-cigma_test_LDADD += $(BOOST_FILESYSTEM_LIB)
+cigma_test_ldadd =
+cigma_test_ldadd += $(CPPUNIT_LIBS)
+cigma_test_ldadd += libcigma.a
+cigma_test_ldadd += libann.a
+cigma_test_ldadd += $(HDF5_LIBS)
+cigma_test_ldadd += $(VTK_LIBS)
+cigma_test_ldadd += $(BOOST_SYSTEM_LIB)
+cigma_test_ldadd += $(BOOST_FILESYSTEM_LIB)
 
-cigma_test_SOURCES = \
+cigma_test_sources = \
 	tests/simple/SimpleTest.h \
 	tests/simple/SimpleTest.cpp \
 	tests/libcigma/ArrayTest.h \
@@ -460,6 +472,15 @@
 	tests/pytests/test_extract.py \
 	tests/pytests/runner.py
 
+# system tests
+EXTRA_DIST += \
+	tests/system/README \
+	tests/system/out/README \
+	tests/system/100-extract.sh \
+	tests/system/200-eval.sh \
+	tests/system/300-compare.sh \
+	tests/system/runner.py
+
 # test data
 EXTRA_DIST += \
 	tests/data/brick1/brick1.jou \
@@ -479,8 +500,7 @@
 	tests/data/README
 
 # additional files
-#EXTRA_DIST += \
-#	tests/README
+EXTRA_DIST += tests/README
 
 # }}}
 

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2008-12-10 02:16:15 UTC (rev 13620)
+++ cs/cigma/trunk/configure.ac	2008-12-10 02:16:17 UTC (rev 13621)
@@ -71,10 +71,13 @@
 
 
 dnl Configure CppUnit
-AM_PATH_CPPUNIT([1.12.0],
-                [with_cppunit=yes],
-                [with_cppunit=no; AC_MSG_RESULT([no. Unit tests disabled])])
-AM_CONDITIONAL(BUILD_CPPUNIT_TESTS, [test x${with_cppunit} = xyes])
+AC_ARG_ENABLE([testing], [AC_HELP_STRING([--enable-testing], [enable unit testing with cppunit (requires cppunit) @<:@default=no@:>@])])
+AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes])
+if test "$enable_testing" = "yes"; then
+    AM_PATH_CPPUNIT([1.12.0],
+        [with_cppunit=yes],
+        [with_cppunit=no; AC_MSG_RESULT([no. Unit tests disabled])])
+fi
 
 
 dnl XXX: Update DISTCHECK_CONFIGURE_FLAGS (see m4 macros in gitosis branch)