diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-11-06 16:58:16 -0500 |
|---|---|---|
| committer | Tianyi Liang <tianyi-liang@uiowa.edu> | 2013-11-10 18:47:35 -0600 |
| commit | 726603e0e5a5482cf98538079790747e43313276 (patch) | |
| tree | 12e41e99a21a16cf9cff7374a84d9a6527f03c8b /test/unit | |
| parent | 6c6f44c32a6bb957c1e82ae75fbf62db2e286595 (diff) | |
Flatten libcvc4 build structure; remove some #include interdependences
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/Makefile.am | 19 | ||||
| -rw-r--r-- | test/unit/expr/attribute_white.h | 3 | ||||
| -rw-r--r-- | test/unit/expr/node_manager_black.h | 1 |
3 files changed, 14 insertions, 9 deletions
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index a5530ab6d..937a4e8c8 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -1,5 +1,11 @@ # All unit tests UNIT_TESTS = \ + expr/expr_public \ + expr/expr_manager_public \ + expr/type_cardinality_public \ + util/cardinality_public +if WHITE_AND_BLACK_TESTS +UNIT_TESTS += \ theory/logic_info_white \ theory/theory_engine_white \ theory/theory_black \ @@ -7,8 +13,6 @@ UNIT_TESTS = \ theory/theory_arith_white \ theory/theory_bv_white \ theory/type_enumerator_white \ - expr/expr_public \ - expr/expr_manager_public \ expr/node_white \ expr/node_black \ expr/kind_black \ @@ -20,7 +24,6 @@ UNIT_TESTS = \ expr/attribute_black \ expr/symbol_table_black \ expr/node_self_iterator_black \ - expr/type_cardinality_public \ expr/type_node_white \ parser/parser_black \ parser/parser_builder_black \ @@ -51,9 +54,9 @@ UNIT_TESTS = \ util/trans_closure_black \ util/boolean_simplification_black \ util/subrange_bound_white \ - util/cardinality_public \ util/recursion_breaker_black \ main/interactive_shell_black +endif export VERBOSE = 1 @@ -88,12 +91,12 @@ AM_LDFLAGS_BLACK = AM_LDFLAGS_PUBLIC = AM_LIBADD_WHITE = \ @abs_top_builddir@/src/main/libmain.a \ - @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ - @abs_top_builddir@/src/libcvc4_noinst.la + @abs_top_builddir@/src/parser/libcvc4parser.la \ + @abs_top_builddir@/src/libcvc4.la AM_LIBADD_BLACK = \ @abs_top_builddir@/src/main/libmain.a \ - @abs_top_builddir@/src/parser/libcvc4parser_noinst.la \ - @abs_top_builddir@/src/libcvc4_noinst.la + @abs_top_builddir@/src/parser/libcvc4parser.la \ + @abs_top_builddir@/src/libcvc4.la AM_LIBADD_PUBLIC = \ @abs_top_builddir@/src/parser/libcvc4parser.la \ @abs_top_builddir@/src/libcvc4.la diff --git a/test/unit/expr/attribute_white.h b/test/unit/expr/attribute_white.h index 5ce5badd0..f5d1af5cd 100644 --- a/test/unit/expr/attribute_white.h +++ b/test/unit/expr/attribute_white.h @@ -23,6 +23,7 @@ #include "expr/node_builder.h" #include "expr/node_manager.h" #include "expr/attribute.h" +#include "expr/node_manager_attributes.h" #include "expr/node.h" #include "theory/theory.h" #include "theory/theory_engine.h" @@ -143,7 +144,7 @@ public: // TS_ASSERT_DIFFERS(theory::PreRewriteCacheTop::s_id, theory::PostRewriteCacheTop::s_id); lastId = attr::LastAttributeId<TypeNode, false>::getId(); - TS_ASSERT_LESS_THAN(NodeManager::TypeAttr::s_id, lastId); + TS_ASSERT_LESS_THAN(TypeAttr::s_id, lastId); } diff --git a/test/unit/expr/node_manager_black.h b/test/unit/expr/node_manager_black.h index 8c70dfdcf..860dfb1a9 100644 --- a/test/unit/expr/node_manager_black.h +++ b/test/unit/expr/node_manager_black.h @@ -20,6 +20,7 @@ #include <vector> #include "expr/node_manager.h" +#include "expr/node_manager_attributes.h" #include "context/context.h" #include "util/rational.h" |