diff options
author | Morgan Deters <mdeters@gmail.com> | 2009-12-17 21:05:15 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2009-12-17 21:05:15 +0000 |
commit | dfcf7dba0b2d8ad6eb9d8540e92804e70205b8fb (patch) | |
tree | 6cc700c94a4a72e5f4b758803b079dfed059e054 /test | |
parent | fdc93191d331c6bd4a2934eb5cbeb18d78cb078d (diff) |
update-copyright.pl now retrieves and incorporates author information from repository history; re-ran update-copyright.pl; cleaned up some things with make
Diffstat (limited to 'test')
-rw-r--r-- | test/unit/Makefile.am | 46 | ||||
-rw-r--r-- | test/unit/Makefile.in | 45 | ||||
-rw-r--r-- | test/unit/expr/node_black.h | 15 | ||||
-rw-r--r-- | test/unit/expr/node_white.h | 15 | ||||
-rw-r--r-- | test/unit/parser/cvc/cvc_parser_black.h | 15 |
5 files changed, 101 insertions, 35 deletions
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index d8f321f10..61eef32d5 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -1,23 +1,39 @@ +# all unit tests +UNIT_TESTS = \ + expr/node_white \ + expr/node_black \ + parser/cvc/cvc_parser_black \ + parser/smt/smt_parser_black + +# things that aren't tests but that tests rely on and need to +# go into the distribution +TEST_DEPENDENCIES = + if HAVE_CXXTESTGEN AM_CPPFLAGS = \ - -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" + -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" \ + $(TEST_CPPFLAGS) +AM_CXXFLAGS = $(TEST_CXXFLAGS) +AM_LDFLAGS = $(TEST_LDFLAGS) + AM_CXXFLAGS_WHITE = -fno-access-control AM_CXXFLAGS_BLACK = AM_CXXFLAGS_PUBLIC = AM_LDFLAGS_WHITE = \ - @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ - @abs_top_builddir@/src/libcvc4_noinst.la + @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ + @abs_top_builddir@/src/libcvc4_noinst.la AM_LDFLAGS_BLACK = \ - $(AM_LDFLAGS_WHITE) + @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ + @abs_top_builddir@/src/libcvc4_noinst.la AM_LDFLAGS_PUBLIC = \ - @abs_top_builddir@/src/libcvc4.la + @abs_top_builddir@/src/libcvc4.la -TESTS = \ - expr/node_white \ - expr/node_black \ - parser/cvc/cvc_parser_black \ - parser/smt/smt_parser_black +TESTS = $(UNIT_TESTS) + +EXTRA_DIST = \ + no_cxxtest \ + $(TEST_DEPENDENCIES) # without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-( noinst_LTLIBRARIES = libdummy.la @@ -28,18 +44,12 @@ $(TESTS:%=%.cpp): %.cpp: %.h mkdir -p `dirname "$@"` @CXXTESTGEN@ --have-eh --have-std --error-printer -o "$@" "$<" $(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 $(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 $(filter %_public,$(TESTS)): %_public: %_public.cpp -# get these in here somehow -# $(TEST_CPPFLAGS) $(TEST_CXXFLAGS) $(TEST_LDFLAGS) $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $< $(CXXLINK) $(AM_LDFLAGS_PUBLIC) $@.lo @@ -50,4 +60,8 @@ else # force a user-visible failure for "make check" TESTS = no_cxxtest +EXTRA_DIST = \ + $(UNIT_TESTS) \ + $(TEST_DEPENDENCIES) + endif diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index 251ef2dfe..6e518d527 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -213,30 +213,49 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ + +# all unit tests +UNIT_TESTS = \ + expr/node_white \ + expr/node_black \ + parser/cvc/cvc_parser_black \ + parser/smt/smt_parser_black + + +# things that aren't tests but that tests rely on and need to +# go into the distribution +TEST_DEPENDENCIES = @HAVE_CXXTESTGEN_TRUE@AM_CPPFLAGS = \ -@HAVE_CXXTESTGEN_TRUE@ -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" +@HAVE_CXXTESTGEN_TRUE@ -I. "-I@CXXTEST@" "-I@top_srcdir@/src/include" "-I@top_srcdir@/src" \ +@HAVE_CXXTESTGEN_TRUE@ $(TEST_CPPFLAGS) +@HAVE_CXXTESTGEN_TRUE@AM_CXXFLAGS = $(TEST_CXXFLAGS) +@HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS = $(TEST_LDFLAGS) @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/parser/libcvc4parser_noinst.la \ -@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4_noinst.la +@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ +@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4_noinst.la @HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_BLACK = \ -@HAVE_CXXTESTGEN_TRUE@ $(AM_LDFLAGS_WHITE) +@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ +@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4_noinst.la @HAVE_CXXTESTGEN_TRUE@AM_LDFLAGS_PUBLIC = \ -@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4.la +@HAVE_CXXTESTGEN_TRUE@ @abs_top_builddir@/src/libcvc4.la # 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@ parser/cvc/cvc_parser_black \ -@HAVE_CXXTESTGEN_TRUE@ parser/smt/smt_parser_black +@HAVE_CXXTESTGEN_TRUE@TESTS = $(UNIT_TESTS) +@HAVE_CXXTESTGEN_FALSE@EXTRA_DIST = \ +@HAVE_CXXTESTGEN_FALSE@ $(UNIT_TESTS) \ +@HAVE_CXXTESTGEN_FALSE@ $(TEST_DEPENDENCIES) + +@HAVE_CXXTESTGEN_TRUE@EXTRA_DIST = \ +@HAVE_CXXTESTGEN_TRUE@ no_cxxtest \ +@HAVE_CXXTESTGEN_TRUE@ $(TEST_DEPENDENCIES) # without these here, LTCXXCOMPILE, CXXLINK, etc., aren't set :-( @@ -629,18 +648,12 @@ uninstall-am: @HAVE_CXXTESTGEN_TRUE@ mkdir -p `dirname "$@"` @HAVE_CXXTESTGEN_TRUE@ @CXXTESTGEN@ --have-eh --have-std --error-printer -o "$@" "$<" @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@$(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@$(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 $< @HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_PUBLIC) $@.lo diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h index c95900383..aa99c70c4 100644 --- a/test/unit/expr/node_black.h +++ b/test/unit/expr/node_black.h @@ -1,4 +1,17 @@ -/* Black box testing of CVC4::Node. */ +/********************* -*- C++ -*- */ +/** node_black.h + ** Original author: mdeters + ** Major contributors: none + ** Minor contributors (to current version): dejan + ** This file is part of the CVC4 prototype. + ** Copyright (c) 2009 The Analysis of Computer Systems Group (ACSys) + ** Courant Institute of Mathematical Sciences + ** New York University + ** See the file COPYING in the top-level source directory for licensing + ** information. + ** + ** Black box testing of CVC4::Node. + **/ #include <cxxtest/TestSuite.h> diff --git a/test/unit/expr/node_white.h b/test/unit/expr/node_white.h index dd462fdd8..96a30e582 100644 --- a/test/unit/expr/node_white.h +++ b/test/unit/expr/node_white.h @@ -1,4 +1,17 @@ -/* White box testing of CVC4::Node. */ +/********************* -*- C++ -*- */ +/** node_white.h + ** Original author: mdeters + ** Major contributors: none + ** Minor contributors (to current version): dejan + ** This file is part of the CVC4 prototype. + ** Copyright (c) 2009 The Analysis of Computer Systems Group (ACSys) + ** Courant Institute of Mathematical Sciences + ** New York University + ** See the file COPYING in the top-level source directory for licensing + ** information. + ** + ** White box testing of CVC4::Node. + **/ #include <cxxtest/TestSuite.h> diff --git a/test/unit/parser/cvc/cvc_parser_black.h b/test/unit/parser/cvc/cvc_parser_black.h index e99cce44d..4679d358c 100644 --- a/test/unit/parser/cvc/cvc_parser_black.h +++ b/test/unit/parser/cvc/cvc_parser_black.h @@ -1,4 +1,17 @@ -/* Black box testing of CVC4::parser::CvcParser. */ +/********************* -*- C++ -*- */ +/** cvc_parser_black.h + ** Original author: cconway + ** Major contributors: none + ** Minor contributors (to current version): none + ** This file is part of the CVC4 prototype. + ** Copyright (c) 2009 The Analysis of Computer Systems Group (ACSys) + ** Courant Institute of Mathematical Sciences + ** New York University + ** See the file COPYING in the top-level source directory for licensing + ** information. + ** + ** Black box testing of CVC4::parser::CvcParser. + **/ #include <cxxtest/TestSuite.h> //#include <string> |