diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
commit | 129dadba47447148096acd216d61f93e14539cb4 (patch) | |
tree | fd0053624ee96ee84eb35d1542d1977e40830750 /test/regress | |
parent | 4c87c0794b7e954afd090cfbf441caa0b09c3ef5 (diff) |
Bug-related:
* ITE removal fixed to be context-dependent (on UserContext).
Resolves incrementality bugs 376 and 396 (which had given wrong answers).
* some bugfixes for incrementality that Dejan found (fixes bug 394)
* fix for bug in SmtEngine::getValue() where definitions weren't respected
(partially resolves bug 411, but get-model is still broken).
* change status of microwave21.ec.minimized.smt2 (it's actually unsat, but
was labeled sat); re-enable it for "make regress"
Also:
* --check-model doesn't fail if quantified assertions don't simplify away.
* fix some examples, and the Java system test, for the disappearance of the
BoolExpr class
* add copy constructor to array type enumerator (the type enumerator
framework requires copy ctors, and the automatically-generated copy ctor
was copying pointers that were then deleted, leaving dangling pointers in
the copy and causing segfaults)
* --dump=assertions now implies --dump=skolems
* --dump=assertions:pre-<PASS> and --dump=assertions:post-<PASS> now allow
you to dump before/after a particular preprocessing pass. E.g.,
--dump=assertions:pre-ite-removal or --dump=assertions:post-static-learning.
"--dump=assertions" by itself is after all preprocessing, just before CNF
conversion.
* minor fixes to dumping output
* include Model in language bindings
Minor refactoring/misc:
* fix compiler warning in src/theory/model.cpp
* remove unnecessary SmtEngine::printModel().
* mkoptions script doesn't give progress output if stdout isn't a terminal
(e.g., if it's written to a log, or piped through less(1), or whatever).
* add some type enumerator unit tests
* de-emphasize --parse-only and --preprocess-only (they aren't really "common"
options)
* fix some exception throw() specifications in SmtEngine
* minor documentation clarifications
Diffstat (limited to 'test/regress')
-rw-r--r-- | test/regress/regress0/push-pop/Makefile.am | 8 | ||||
-rw-r--r-- | test/regress/regress0/push-pop/bug394.smt2 | 72 | ||||
-rw-r--r-- | test/regress/regress0/uflia/Makefile.am | 8 | ||||
-rw-r--r-- | test/regress/regress0/uflia/microwave21.ec.minimized.smt2 | 4 |
4 files changed, 45 insertions, 47 deletions
diff --git a/test/regress/regress0/push-pop/Makefile.am b/test/regress/regress0/push-pop/Makefile.am index 0af49ee1a..ca86f920d 100644 --- a/test/regress/regress0/push-pop/Makefile.am +++ b/test/regress/regress0/push-pop/Makefile.am @@ -30,14 +30,14 @@ SMT2_TESTS = \ BUG_TESTS = \ bug216.smt2 \ bug233.cvc \ - bug326.smt2 + bug326.smt2 \ + bug394.smt2 \ + bug396.smt2 TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(BUG_TESTS) EXTRA_DIST = $(TESTS) \ - bug216.smt2.expect \ - bug394.smt2 \ - bug396.smt2 + bug216.smt2.expect # synonyms for "check" in this directory .PHONY: regress regress0 test diff --git a/test/regress/regress0/push-pop/bug394.smt2 b/test/regress/regress0/push-pop/bug394.smt2 index 5b045812d..38e59be4f 100644 --- a/test/regress/regress0/push-pop/bug394.smt2 +++ b/test/regress/regress0/push-pop/bug394.smt2 @@ -1,7 +1,7 @@ ;(set-option :produce-unsat-cores true)
(set-option :print-success false)
(set-info :smt-lib-version 2.0)
-(set-option :produce-models true)
+;(set-option :produce-models true)
(set-logic ALL_SUPPORTED)
; done setting options
@@ -1500,9 +1500,9 @@ _b44 _b45) $getIdx)
))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 9318)))
-(get-value ((ControlFlow 0 823)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 9318)))
+;(get-value ((ControlFlow 0 823)))
(assert (not (= (ControlFlow 0 823) (- 10729))))
(check-sat)
(pop 1)
@@ -1613,34 +1613,34 @@ _b44 _b45) $DCT)
))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13495))))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13487))))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13509))))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13553))))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(pop 1)
(push 1)
(set-info :boogie-vc-id $DCT)
@@ -1695,21 +1695,21 @@ _b44 _b45) $DCT)
))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13575))))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13712))))
(check-sat)
-(get-value ((ControlFlow 0 0)))
-(get-value ((ControlFlow 0 11167)))
-(get-value ((ControlFlow 0 4117)))
-(get-value ((ControlFlow 0 4199)))
+;(get-value ((ControlFlow 0 0)))
+;(get-value ((ControlFlow 0 11167)))
+;(get-value ((ControlFlow 0 4117)))
+;(get-value ((ControlFlow 0 4199)))
(assert (not (= (ControlFlow 0 4199) (- 13700))))
(check-sat)
diff --git a/test/regress/regress0/uflia/Makefile.am b/test/regress/regress0/uflia/Makefile.am index 751d69fe5..27487b962 100644 --- a/test/regress/regress0/uflia/Makefile.am +++ b/test/regress/regress0/uflia/Makefile.am @@ -40,15 +40,13 @@ SMT2_TESTS = \ FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 \ stalmark_e7_27_e7_31.ec.minimized.smt2 \ stalmark_e7_27_e7_31.ec.smt2 \ - tiny.smt2 + tiny.smt2 \ + speed2_e8_449_e8_517.ec.smt2 \ + microwave21.ec.minimized.smt2 # simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 # javafe.ast.StandardPrettyPrint.319_no_forall.smt2 # javafe.ast.WhileStmt.447_no_forall.smt2 -# CURRENTLY FAILING: -# speed2_e8_449_e8_517.ec.smt2 -# microwave21.ec.minimized.smt2 - # Regression tests for PL inputs CVC_TESTS = diff --git a/test/regress/regress0/uflia/microwave21.ec.minimized.smt2 b/test/regress/regress0/uflia/microwave21.ec.minimized.smt2 index 0d9accb91..b37db9a1e 100644 --- a/test/regress/regress0/uflia/microwave21.ec.minimized.smt2 +++ b/test/regress/regress0/uflia/microwave21.ec.minimized.smt2 @@ -1,7 +1,7 @@ ; initialize_defs ; PROPERTY DEFGEN (set-logic QF_UFNIA) -(set-info :status sat) +(set-info :status unsat) (declare-fun _base () Int) (declare-fun _n () Int) (assert (>= _n 0)) @@ -441,4 +441,4 @@ ; not refinement_pass (assert (not (=> (= _base (- 0 1)) (and (P (- 0 1)) (P 0))))) (assert true) -(check-sat)
\ No newline at end of file +(check-sat) |