testing infrastructure fixes

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index e10856bba31118fb1aec8f004b5820daeca1a706..0a1239b81cbdb68ef38be34c0d3bb8fc27fe5501 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -2,8 +2,13 @@ if HAVE_CXXTESTGEN
 
 AM_CPPFLAGS = \
        -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src"
-AM_CXXFLAGS = -fno-access-control
-#AM_LDFLAGS = -L@top_builddir@/src/libcvc4.la
+AM_LDFLAGS = \
+               @abs_top_builddir@/src/context/libcontext.la \
+               @abs_top_builddir@/src/expr/libexpr.la \
+               @abs_top_builddir@/src/smt/libsmt.la \
+               @abs_top_builddir@/src/theory/libtheory.la \
+               @abs_top_builddir@/src/util/libutil.la \
+               @abs_top_builddir@/src/prop/minisat/libminisat.la
 
 TESTS_WHITE = \
        expr/node_white
@@ -22,17 +27,16 @@ libdummy_la_LIBADD = @abs_top_builddir@/src/libcvc4.la
 $(TESTS:%=%.cpp): %.cpp: %.h
        mkdir -p `dirname "$@"`
        @CXXTESTGEN@ --have-eh --have-std --error-printer -o "$@" "$<"
-$(TESTS): %: %.cpp
+$(TESTS_WHITE): %: %.cpp
+#      get these in here somehow
+#      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
+       $(LTCXXCOMPILE) -c -fno-access-control -o $@.lo $<
+       $(CXXLINK) $@.lo
+$(TESTS_BLACK): %: %.cpp
 #      get these in here somehow
 #      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
        $(LTCXXCOMPILE) -c -o $@.lo $<
-       $(CXXLINK) $@.lo \
-               @abs_top_builddir@/src/context/libcontext.la \
-               @abs_top_builddir@/src/expr/libexpr.la \
-               @abs_top_builddir@/src/smt/libsmt.la \
-               @abs_top_builddir@/src/theory/libtheory.la \
-               @abs_top_builddir@/src/util/libutil.la \
-               @abs_top_builddir@/src/prop/minisat/libminisat.la
+       $(CXXLINK) $@.lo
 
 MOSTLYCLEANFILES = $(TESTS) $(TESTS:%=%.cpp)
 

diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in
index 0b4b68c40dd99bfe7ba121db5e5525cfb83bf914..d5c49cc78b12b39e4c8472f49069abdc04d613b5 100644 (file)
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -238,8 +238,14 @@ top_srcdir = @top_srcdir@
 @HAVE_CXXTESTGEN_TRUE@AM_CPPFLAGS = \
 @HAVE_CXXTESTGEN_TRUE@ -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src"
 
-@HAVE_CXXTESTGEN_TRUE@AM_CXXFLAGS = -fno-access-control
-#AM_LDFLAGS = -L@top_builddir@/src/libcvc4.la
+@HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS = \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/context/libcontext.la \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/expr/libexpr.la \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/smt/libsmt.la \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/theory/libtheory.la \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/util/libutil.la \
+@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/prop/minisat/libminisat.la
+
 @HAVE_CXXTESTGEN_TRUE@TESTS_WHITE = \
 @HAVE_CXXTESTGEN_TRUE@ expr/node_white
 
@@ -666,17 +672,16 @@ uninstall-am: uninstall-libLTLIBRARIES
 @HAVE_CXXTESTGEN_TRUE@$(TESTS:%=%.cpp): %.cpp: %.h
 @HAVE_CXXTESTGEN_TRUE@ mkdir -p `dirname "$@"`
 @HAVE_CXXTESTGEN_TRUE@ @CXXTESTGEN@ --have-eh --have-std --error-printer -o "$@" "$<"
-@HAVE_CXXTESTGEN_TRUE@$(TESTS): %: %.cpp
+@HAVE_CXXTESTGEN_TRUE@$(TESTS_WHITE): %: %.cpp
+#      get these in here somehow
+#      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
+@HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) -c -fno-access-control -o $@.lo $<
+@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $@.lo
+@HAVE_CXXTESTGEN_TRUE@$(TESTS_BLACK): %: %.cpp
 #      get these in here somehow
 #      $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS)
 @HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) -c -o $@.lo $<
-@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $@.lo \
-@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/context/libcontext.la \
-@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/expr/libexpr.la \
-@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/smt/libsmt.la \
-@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/theory/libtheory.la \
-@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/util/libutil.la \
-@HAVE_CXXTESTGEN_TRUE@         @abs_top_builddir@/src/prop/minisat/libminisat.la
+@HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $@.lo
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h
index 5489e480311ae2c8bf9fdff8cc33f920b7df0d89..c95900383a58938b0ae5364b69a311eeaa559a60 100644 (file)
--- a/test/unit/expr/node_black.h
+++ b/test/unit/expr/node_black.h
@@ -10,10 +10,10 @@ class NodeBlack : public CxxTest::TestSuite {
 public:
 
   void testNull() {
-    Node::s_null;
+    Node::null();
   }
 
   void testCopyCtor() {
-    Node e(Node::s_null);
+    Node e(Node::null());
   }
 };