summaryrefslogtreecommitdiff
path: root/test/regress
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2010-01-26 07:29:41 +0000
committerMorgan Deters <mdeters@gmail.com>2010-01-26 07:29:41 +0000
commit21e01d42ed4c0b6d9fa5855c2e0cfc1a3765d14f (patch)
treeec785ced868a294e72cc751a293c618488743c8b /test/regress
parentf2d38a8522579f9b3e434f76a9426fa8d2f06d07 (diff)
fixes to build structure, util classes, lots of fixes to Node and NodeBuilder. outstanding SEGVs fixed
Diffstat (limited to 'test/regress')
-rw-r--r--test/regress/Makefile.am2
-rw-r--r--test/regress/Makefile.in4
-rw-r--r--test/regress/simple2.smt4
3 files changed, 6 insertions, 4 deletions
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))
)
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback