summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/smt/smt_engine.cpp17
-rw-r--r--test/regress/CMakeLists.txt1
-rw-r--r--test/regress/regress0/options/invalid_option_inc_proofs.smt26
3 files changed, 19 insertions, 5 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index 8705bfb9b..d72b303a6 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -2269,13 +2269,20 @@ void SmtEngine::setDefaults() {
}
}
- if(options::incrementalSolving() && options::proof()) {
- Warning() << "SmtEngine: turning off incremental solving mode (not yet supported with --proof, try --tear-down-incremental instead)" << endl;
- setOption("incremental", SExpr("false"));
- }
-
if (options::proof())
{
+ if (options::incrementalSolving())
+ {
+ if (options::incrementalSolving.wasSetByUser())
+ {
+ throw OptionException("--incremental is not supported with proofs");
+ }
+ Warning()
+ << "SmtEngine: turning off incremental solving mode (not yet "
+ "supported with --proof, try --tear-down-incremental instead)"
+ << endl;
+ setOption("incremental", SExpr("false"));
+ }
if (d_logic > LogicInfo("QF_AUFBVLRA")) {
throw OptionException(
"Proofs are only supported for sub-logics of QF_AUFBVLIA.");
diff --git a/test/regress/CMakeLists.txt b/test/regress/CMakeLists.txt
index d3f463afd..194dbd663 100644
--- a/test/regress/CMakeLists.txt
+++ b/test/regress/CMakeLists.txt
@@ -553,6 +553,7 @@ set(regress_0_tests
regress0/nl/very-easy-sat.smt2
regress0/nl/very-simple-unsat.smt2
regress0/options/invalid_dump.smt2
+ regress0/options/invalid_option_inc_proofs.smt2
regress0/opt-abd-no-use.smt2
regress0/parallel-let.smt2
regress0/parser/as.smt2
diff --git a/test/regress/regress0/options/invalid_option_inc_proofs.smt2 b/test/regress/regress0/options/invalid_option_inc_proofs.smt2
new file mode 100644
index 000000000..f63dbd27f
--- /dev/null
+++ b/test/regress/regress0/options/invalid_option_inc_proofs.smt2
@@ -0,0 +1,6 @@
+; REQUIRES: proof
+; COMMAND-LINE: --incremental --proof
+; EXPECT: (error "Error in option parsing: --incremental is not supported with proofs")
+; EXIT: 1
+(set-logic QF_BV)
+(check-sat)
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback