diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-01-26 07:29:41 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-01-26 07:29:41 +0000 |
| commit | 21e01d42ed4c0b6d9fa5855c2e0cfc1a3765d14f (patch) | |
| tree | ec785ced868a294e72cc751a293c618488743c8b /test | |
| parent | f2d38a8522579f9b3e434f76a9426fa8d2f06d07 (diff) | |
fixes to build structure, util classes, lots of fixes to Node and NodeBuilder. outstanding SEGVs fixed
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/regress/Makefile.am | 2 | ||||
| -rw-r--r-- | test/regress/Makefile.in | 4 | ||||
| -rw-r--r-- | test/regress/simple2.smt | 4 | ||||
| -rw-r--r-- | test/system/Makefile.in | 2 | ||||
| -rw-r--r-- | test/unit/Makefile.am | 2 | ||||
| -rw-r--r-- | test/unit/Makefile.in | 3 |
7 files changed, 15 insertions, 4 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index c2eabd8a4..6e8fff2a7 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -103,6 +103,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILDING_SHARED = @BUILDING_SHARED@ +BUILDING_STATIC = @BUILDING_STATIC@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/test/regress/Makefile.am b/test/regress/Makefile.am index bee3e3a85..c5e6ec676 100644 --- a/test/regress/Makefile.am +++ b/test/regress/Makefile.am @@ -1,4 +1,4 @@ -TESTS_ENVIRONMENT = @top_builddir@/bin/cvc4 +TESTS_ENVIRONMENT = @top_builddir@/../../bin/cvc4 TESTS = \ simple.cvc \ simple.smt \ diff --git a/test/regress/Makefile.in b/test/regress/Makefile.in index 4ba824928..2670ecd65 100644 --- a/test/regress/Makefile.in +++ b/test/regress/Makefile.in @@ -65,6 +65,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILDING_SHARED = @BUILDING_SHARED@ +BUILDING_STATIC = @BUILDING_STATIC@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -190,7 +192,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS_ENVIRONMENT = @top_builddir@/bin/cvc4 +TESTS_ENVIRONMENT = @top_builddir@/../../bin/cvc4 TESTS = \ simple.cvc \ simple.smt \ diff --git a/test/regress/simple2.smt b/test/regress/simple2.smt index c8db8c13f..e917d1b64 100644 --- a/test/regress/simple2.smt +++ b/test/regress/simple2.smt @@ -5,9 +5,9 @@ :extrapreds ((x1)) :extrapreds ((x2)) :extrapreds ((x3)) -:assumption (or x1 (not x0)) :formula -(and (or x0 (not x3)) +(and (or x1 (not x0)) + (or x0 (not x3)) (or x3 x2) (not x1)) ) diff --git a/test/system/Makefile.in b/test/system/Makefile.in index 14e1ac9c7..4b457a954 100644 --- a/test/system/Makefile.in +++ b/test/system/Makefile.in @@ -65,6 +65,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILDING_SHARED = @BUILDING_SHARED@ +BUILDING_STATIC = @BUILDING_STATIC@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index df85ba805..fcaa2cc5d 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -4,6 +4,8 @@ UNIT_TESTS = \ expr/node_black \ parser/parser_black +TESTS_DEPENDENCIES = $(abs_top_builddir)/src/libcvc4.la $(abs_top_builddir)/src/parser/libcvc4parser.la + # things that aren't tests but that tests rely on and need to # go into the distribution TEST_DEPS = diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in index 4d20d59de..49912b26c 100644 --- a/test/unit/Makefile.in +++ b/test/unit/Makefile.in @@ -88,6 +88,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILDING_SHARED = @BUILDING_SHARED@ +BUILDING_STATIC = @BUILDING_STATIC@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -220,6 +222,7 @@ UNIT_TESTS = \ expr/node_black \ parser/parser_black +TESTS_DEPENDENCIES = $(abs_top_builddir)/src/libcvc4.la $(abs_top_builddir)/src/parser/libcvc4parser.la # things that aren't tests but that tests rely on and need to # go into the distribution |