diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-03-08 23:49:47 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-03-08 23:49:47 +0000 |
| commit | cf4d347cbbbb4c1a1e1db99337cfd2b22b84b756 (patch) | |
| tree | ceea43e3d37525038bed10b115c73a8aa08ce68d /test | |
| parent | de0160112edbed8ce9b62bf87172ae2f0e99a013 (diff) | |
This fixes regressions at levels >= 1 which were failing
* implement zombification and garbage collection of NodeValues
(but GC not turned on yet)
* implement removal of key nodes from all attribute tables
* audit NodeBuilder and fix memory leaks and improper reference-count
management. This is in many places a re-write. Clearly documented
invariants on NodeBuilder state. (Closes Bug 38)
* created a "BackedNodeBuilder" that can be used to construct
NodeBuilders with a stack-based backing store for a size that's not
a compile-time constant.
* NodeValues no longer depend on Node for toStream()'ing
* make unit test-building "silent" with --enable-silent-rules
* (Makefile.am, Makefile.builds.in) fix top-level build system so that
"make regressN" works with unbuilt/out-of-date source trees in the
expected way.
* (various) code cleanup, documentation, formatting
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/Makefile.am | 11 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 22 |
2 files changed, 25 insertions, 8 deletions
diff --git a/test/system/Makefile.am b/test/system/Makefile.am index 15f781333..59a37a4db 100644 --- a/test/system/Makefile.am +++ b/test/system/Makefile.am @@ -22,6 +22,17 @@ TEST_DEPS = \ EXTRA_DIST = \ $(TEST_DEPS_DIST) +if STATIC_BINARY +system_LINK = $(CXXLINK) -all-static +else +system_LINK = $(CXXLINK) +endif + +# WHEN SYSTEM TESTS ARE ADDED, BUILD LIKE THIS: +# system_test: system_test.cpp +# $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS) -c -o $@.lo $< +# $(AM_V_CXXLD)$(system_LINK) $(AM_LDFLAGS) $@.lo + # rebuild tests if a library changes $(TESTS):: $(TEST_DEPS) diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 967d6a8c8..9d1a2995b 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -64,18 +64,24 @@ MOSTLYCLEANFILES = $(UNIT_TESTS) $(UNIT_TESTS:%=%.cpp) # that file for comment) # TESTS = +if STATIC_BINARY +unit_LINK = $(CXXLINK) -all-static +else +unit_LINK = $(CXXLINK) +endif + $(UNIT_TESTS:%=%.cpp): %.cpp: %.h - mkdir -p `dirname "$@"` - $(CXXTESTGEN) --have-eh --have-std --error-printer -o "$@" "$<" + $(AM_V_at)mkdir -p `dirname "$@"` + $(AM_V_GEN)$(CXXTESTGEN) --have-eh --have-std --error-printer -o "$@" "$<" $(WHITE_TESTS): %_white: %_white.cpp $(TEST_DEPS) - $(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@.lo $< - $(CXXLINK) $(AM_LDFLAGS_WHITE) $@.lo + $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@.lo $< + $(AM_V_CXXLD)$(unit_LINK) $(AM_LDFLAGS_WHITE) $@.lo $(BLACK_TESTS): %_black: %_black.cpp $(TEST_DEPS) - $(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@.lo $< - $(CXXLINK) $(AM_LDFLAGS_BLACK) $@.lo + $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@.lo $< + $(AM_V_CXXLD)$(unit_LINK) $(AM_LDFLAGS_BLACK) $@.lo $(PUBLIC_TESTS): %_public: %_public.cpp $(TEST_DEPS) - $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $< - $(CXXLINK) $(AM_LDFLAGS_PUBLIC) $@.lo + $(AM_V_CXX)$(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $< + $(AM_V_CXXLD)$(unit_LINK) $(AM_LDFLAGS_PUBLIC) $@.lo else |