diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/Makefile.am | 23 | ||||
| -rw-r--r-- | test/unit/Makefile.in | 102 |
2 files changed, 35 insertions, 90 deletions
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index 9c1c1c56b..f5ba6f410 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -11,43 +11,36 @@ AM_LDFLAGS_WHITE = \ @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/libprop.la \ @abs_top_builddir@/src/prop/minisat/libminisat.la AM_LDFLAGS_BLACK = \ $(AM_LDFLAGS_WHITE) AM_LDFLAGS_PUBLIC = \ @abs_top_builddir@/src/libcvc4.la -TESTS_WHITE = \ - expr/node_white - -TESTS_BLACK = \ - expr/node_black - -TESTS_PUBLIC = - TESTS = \ - $(TESTS_WHITE) \ - $(TESTS_BLACK) \ - $(TESTS_PUBLIC) + expr/node_white \ + expr/node_black -lib_LTLIBRARIES = libdummy.la +# without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-( +noinst_LTLIBRARIES = libdummy.la libdummy_la_SOURCES = expr/node_black.cpp 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_WHITE): %: %.cpp +$(filter %_white,$(TESTS)): %_white: %_white.cpp # get these in here somehow # $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) $(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@.lo $< $(CXXLINK) $(AM_LDFLAGS_WHITE) $@.lo -$(TESTS_BLACK): %: %.cpp +$(filter %_black,$(TESTS)): %_black: %_black.cpp # get these in here somehow # $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) $(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@.lo $< $(CXXLINK) $(AM_LDFLAGS_BLACK) $@.lo -$(TESTS_PUBLIC): %: %.cpp +$(filter %_public,$(TESTS)): %_public: %_public.cpp # get these in here somehow # $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $< diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index 5432c809e..23153db83 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -35,9 +35,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@HAVE_CXXTESTGEN_FALSE@TESTS = no_cxxtest -@HAVE_CXXTESTGEN_TRUE@TESTS = $(TESTS_WHITE) $(TESTS_BLACK) \ -@HAVE_CXXTESTGEN_TRUE@ $(am__EXEEXT_1) subdir = test/unit DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -53,35 +50,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(libdir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) @HAVE_CXXTESTGEN_TRUE@libdummy_la_DEPENDENCIES = \ @HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4.la am__libdummy_la_SOURCES_DIST = expr/node_black.cpp @HAVE_CXXTESTGEN_TRUE@am_libdummy_la_OBJECTS = node_black.lo libdummy_la_OBJECTS = $(am_libdummy_la_OBJECTS) -@HAVE_CXXTESTGEN_TRUE@am_libdummy_la_rpath = -rpath $(libdir) +@HAVE_CXXTESTGEN_TRUE@am_libdummy_la_rpath = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -101,7 +76,6 @@ ETAGS = etags CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -am__EXEEXT_1 = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -242,15 +216,16 @@ 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_CXXFLGAS_WHITE = -fno-access-control -@HAVE_CXXTESTGEN_TRUE@AM_CXXFLGAS_BLACK = -@HAVE_CXXTESTGEN_TRUE@AM_CXXFLGAS_PUBLIC = +@HAVE_CXXTESTGEN_TRUE@AM_CXXFLAGS_WHITE = -fno-access-control +@HAVE_CXXTESTGEN_TRUE@AM_CXXFLAGS_BLACK = +@HAVE_CXXTESTGEN_TRUE@AM_CXXFLAGS_PUBLIC = @HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_WHITE = \ @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/libprop.la \ @HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/prop/minisat/libminisat.la @HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_BLACK = \ @@ -259,14 +234,16 @@ top_srcdir = @top_srcdir@ @HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_PUBLIC = \ @HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4.la -@HAVE_CXXTESTGEN_TRUE@TESTS_WHITE = \ -@HAVE_CXXTESTGEN_TRUE@ expr/node_white -@HAVE_CXXTESTGEN_TRUE@TESTS_BLACK = \ +# force a user-visible failure for "make check" +@HAVE_CXXTESTGEN_FALSE@TESTS = no_cxxtest +@HAVE_CXXTESTGEN_TRUE@TESTS = \ +@HAVE_CXXTESTGEN_TRUE@ expr/node_white \ @HAVE_CXXTESTGEN_TRUE@ expr/node_black -@HAVE_CXXTESTGEN_TRUE@TESTS_PUBLIC = -@HAVE_CXXTESTGEN_TRUE@lib_LTLIBRARIES = libdummy.la + +# without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-( +@HAVE_CXXTESTGEN_TRUE@noinst_LTLIBRARIES = libdummy.la @HAVE_CXXTESTGEN_TRUE@libdummy_la_SOURCES = expr/node_black.cpp @HAVE_CXXTESTGEN_TRUE@libdummy_la_LIBADD = @abs_top_builddir@/src/libcvc4.la @HAVE_CXXTESTGEN_TRUE@MOSTLYCLEANFILES = $(TESTS) $(TESTS:%=%.cpp) @@ -304,32 +281,10 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ test "$$dir" != "$$p" || dir=.; \ echo "rm -f \"$${dir}/so_locations\""; \ @@ -559,9 +514,6 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -590,7 +542,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -617,7 +569,7 @@ install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-html: install-html-am @@ -657,39 +609,39 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES +uninstall-am: .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libLTLIBRARIES clean-libtool ctags \ + clean-generic clean-libtool clean-noinstLTLIBRARIES ctags \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES + tags uninstall uninstall-am @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_WHITE): %: %.cpp +@HAVE_CXXTESTGEN_TRUE@$(filter %_white,$(TESTS)): %_white: %_white.cpp # get these in here somehow # $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) @HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_WHITE) -c -o $@.lo $< @HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_WHITE) $@.lo -@HAVE_CXXTESTGEN_TRUE@$(TESTS_BLACK): %: %.cpp +@HAVE_CXXTESTGEN_TRUE@$(filter %_black,$(TESTS)): %_black: %_black.cpp # get these in here somehow # $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) @HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_BLACK) -c -o $@.lo $< @HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_BLACK) $@.lo -@HAVE_CXXTESTGEN_TRUE@$(TESTS_PUBLIC): %: %.cpp +@HAVE_CXXTESTGEN_TRUE@$(filter %_public,$(TESTS)): %_public: %_public.cpp # get these in here somehow # $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) @HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $< |