summaryrefslogtreecommitdiff
path: root/test/unit
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2012-07-16 19:00:31 +0000
committerMorgan Deters <mdeters@gmail.com>2012-07-16 19:00:31 +0000
commit1f8da4ffd0887a095994392087d76f376ac006d2 (patch)
treee1c94f40b721bf386eaa791de5cd9a13b0b2966a /test/unit
parent5ad6726028477de6059a0af83b8870d9d524a7ac (diff)
now passes "make distcheck", which does important checks for the release (e.g., "make dist" produces a distribution that passes "make dist" and "make check", "make uninstall" actually uninstalls, "make distclean" actually cleans, ...)
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/Makefile.am20
-rw-r--r--test/unit/expr/attribute_white.h2
2 files changed, 20 insertions, 2 deletions
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index dc53bff61..d5b6ce5bf 100644
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -105,7 +105,25 @@ EXTRA_DIST = \
$(UNIT_TESTS:%=%.h) \
$(TEST_DEPS_DIST)
-MOSTLYCLEANFILES = $(UNIT_TESTS) $(UNIT_TESTS:%=%.cpp)
+MOSTLYCLEANFILES = $(UNIT_TESTS) $(UNIT_TESTS:%=%.cpp) $(UNIT_TESTS:%=%.lo)
+
+# the tests automake infrastructure doesn't clean up .o files :-(
+# handle both .libs and _libs variants
+mostlyclean-local:
+ @for f in $(UNIT_TESTS); do \
+ dir="$$(dirname "$$f")"; fil="$$(basename "$$f")"; \
+ for junk in "$$dir/.libs/$$fil.o" \
+ "$$dir/_libs/$$fil.o" \
+ "$$dir/.libs/lt-$$fil" \
+ "$$dir/_libs/lt-$$fil" \
+ "$$dir/.libs/$$fil" \
+ "$$dir/_libs/$$fil"; do \
+ if test -e "$$junk"; then \
+ echo "rm -f \"$$junk\""; \
+ rm -f "$$junk"; \
+ fi; \
+ done; \
+ done
@mk_include@ @srcdir@/Makefile.tests
diff --git a/test/unit/expr/attribute_white.h b/test/unit/expr/attribute_white.h
index 734e38b7b..0fe0e93f0 100644
--- a/test/unit/expr/attribute_white.h
+++ b/test/unit/expr/attribute_white.h
@@ -362,7 +362,7 @@ public:
TS_ASSERT(unnamed.hasAttribute(TestFlag5()));
// test two-arg version of hasAttribute()
- bool bb CVC4_UNUSED;
+ bool bb = false;
Debug("boolattr") << "get flag 1 on a (should be F)\n";
TS_ASSERT(a.getAttribute(TestFlag1(), bb));
TS_ASSERT(! bb);
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback