diff options
Diffstat (limited to 'test')
19 files changed, 2 insertions, 48 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3caa1250e..35d640869 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -43,7 +43,3 @@ if(ENABLE_UNIT_TESTING) add_subdirectory(java) endif() endif() - -if(LFSC_BINARY) - add_subdirectory(signatures) -endif() diff --git a/test/regress/regress0/arrays/issue3814.smt2 b/test/regress/regress0/arrays/issue3814.smt2 index 6c557d99d..6e4a41338 100644 --- a/test/regress/regress0/arrays/issue3814.smt2 +++ b/test/regress/regress0/arrays/issue3814.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-unsat-cores ; EXPECT: sat (set-logic QF_AX) diff --git a/test/regress/regress0/bv/ackermann2.smt2 b/test/regress/regress0/bv/ackermann2.smt2 index 80b8126a0..9bba5f141 100644 --- a/test/regress/regress0/bv/ackermann2.smt2 +++ b/test/regress/regress0/bv/ackermann2.smt2 @@ -1,6 +1,5 @@ ; COMMAND-LINE: --bitblast=eager --no-check-models --no-check-unsat-cores ; REQUIRES: cryptominisat -; REQUIRES: drat2er ; COMMAND-LINE: --bitblast=eager --bv-sat-solver=cryptominisat --no-check-unsat-cores ; EXPECT: unsat (set-logic QF_UFBV) diff --git a/test/regress/regress0/bv/bv_to_int_5230_binary.smt2 b/test/regress/regress0/bv/bv_to_int_5230_binary.smt2 index 32680d862..406041937 100644 --- a/test/regress/regress0/bv/bv_to_int_5230_binary.smt2 +++ b/test/regress/regress0/bv/bv_to_int_5230_binary.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; EXPECT: sat (set-logic QF_UFBV) (set-option :produce-unsat-cores true) diff --git a/test/regress/regress0/bv/bv_to_int_5230_missing_op.smt2 b/test/regress/regress0/bv/bv_to_int_5230_missing_op.smt2 index 757b00e5f..497fbaab1 100644 --- a/test/regress/regress0/bv/bv_to_int_5230_missing_op.smt2 +++ b/test/regress/regress0/bv/bv_to_int_5230_missing_op.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; EXPECT: sat (set-logic ABV) (set-option :check-unsat-cores true) diff --git a/test/regress/regress0/bv/bv_to_int_5230_shift_const.smt2 b/test/regress/regress0/bv/bv_to_int_5230_shift_const.smt2 index e94e0cae5..a8d0144f1 100644 --- a/test/regress/regress0/bv/bv_to_int_5230_shift_const.smt2 +++ b/test/regress/regress0/bv/bv_to_int_5230_shift_const.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; EXPECT: sat (set-logic QF_UFBV) (set-option :check-unsat-cores true) @@ -7,6 +6,6 @@ (declare-const v5 Bool) (declare-const v8 Bool) (declare-const v9 Bool) -(assert (or (distinct ((_ sign_extend 0) #b1001110) (bvlshr #b1001110 #b1001110) ((_ sign_extend 0) #b1001110) #b1001110) v9 (= #b1001110 ((_ sign_extend 0) #b1001110) #b1001110 #b1001110 ((_ sign_extend 0) #b1001110)) v5 (distinct ((_ sign_extend 0) #b1001110) (bvlshr #b1001110 #b1001110) ((_ sign_extend 0) #b1001110) #b1001110))) +(assert (or (distinct ((_ sign_extend 0) #b1001110) (bvlshr #b1001110 #b1001110) ((_ sign_extend 0) #b1001110) #b1001110) v9 (= #b1001110 ((_ sign_extend 0) #b1001110) #b1001110 #b1001110 ((_ sign_extend 0) #b1001110)) v5 (distinct ((_ sign_extend 0) #b1001110) (bvlshr #b1001110 #b1001110) ((_ sign_extend 0) #b1001110) #b1001110))) (assert (or v0 v8)) (check-sat) diff --git a/test/regress/regress0/bv/core/slice-12.smtv1.smt2 b/test/regress/regress0/bv/core/slice-12.smtv1.smt2 index d66b27caa..f370c0f0f 100644 --- a/test/regress/regress0/bv/core/slice-12.smtv1.smt2 +++ b/test/regress/regress0/bv/core/slice-12.smtv1.smt2 @@ -1,5 +1,4 @@ ; REQUIRES: cryptominisat -; REQUIRES: drat2er ; COMMAND-LINE: --bitblast=eager --bv-sat-solver=cryptominisat --no-check-unsat-cores ; EXPECT: unsat (set-option :incremental false) diff --git a/test/regress/regress0/dump-unsat-core-full.smt2 b/test/regress/regress0/dump-unsat-core-full.smt2 index 3c68501f9..a21508efb 100644 --- a/test/regress/regress0/dump-unsat-core-full.smt2 +++ b/test/regress/regress0/dump-unsat-core-full.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --dump-unsat-cores-full ; EXPECT: unsat ; EXPECT: ( diff --git a/test/regress/regress0/nl/issue3959.smt2 b/test/regress/regress0/nl/issue3959.smt2 index cce64a848..eccd6b301 100644 --- a/test/regress/regress0/nl/issue3959.smt2 +++ b/test/regress/regress0/nl/issue3959.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-unsat-cores --incremental ; EXPECT: sat diff --git a/test/regress/regress1/quantifiers/dump-inst-proof.smt2 b/test/regress/regress1/quantifiers/dump-inst-proof.smt2 index 274fc213f..0c8c21f01 100644 --- a/test/regress/regress1/quantifiers/dump-inst-proof.smt2 +++ b/test/regress/regress1/quantifiers/dump-inst-proof.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --dump-instantiations --produce-unsat-cores --print-inst-full ; EXPECT: unsat ; EXPECT: (instantiations (forall ((x Int)) (or (P x) (Q x))) diff --git a/test/regress/regress1/sygus-abduct-test-ccore.smt2 b/test/regress/regress1/sygus-abduct-test-ccore.smt2 index adb38add0..86f5fe133 100644 --- a/test/regress/regress1/sygus-abduct-test-ccore.smt2 +++ b/test/regress/regress1/sygus-abduct-test-ccore.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-abducts --sygus-core-connective ; SCRUBBER: grep -v -E '(\(define-fun)' ; EXIT: 0 diff --git a/test/regress/regress1/sygus-abduct-test-user.smt2 b/test/regress/regress1/sygus-abduct-test-user.smt2 index ed1d5c862..bb02ebce2 100644 --- a/test/regress/regress1/sygus-abduct-test-user.smt2 +++ b/test/regress/regress1/sygus-abduct-test-user.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-abducts ; COMMAND-LINE: --produce-abducts --sygus-core-connective ; SCRUBBER: grep -v -E '(\(define-fun)' diff --git a/test/regress/regress1/sygus/abd-simple-conj-4.smt2 b/test/regress/regress1/sygus/abd-simple-conj-4.smt2 index dda5e9751..98bf70fd7 100644 --- a/test/regress/regress1/sygus/abd-simple-conj-4.smt2 +++ b/test/regress/regress1/sygus/abd-simple-conj-4.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-abducts --sygus-core-connective ; SCRUBBER: grep -v -E '(\(define-fun)' ; EXIT: 0 diff --git a/test/regress/regress1/sygus/abduction_1255.corecstrs.readable.smt2 b/test/regress/regress1/sygus/abduction_1255.corecstrs.readable.smt2 index 691cf6d9a..1595b0865 100644 --- a/test/regress/regress1/sygus/abduction_1255.corecstrs.readable.smt2 +++ b/test/regress/regress1/sygus/abduction_1255.corecstrs.readable.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-abducts --sygus-core-connective ; SCRUBBER: grep -v -E '(\(define-fun)' ; EXIT: 0 diff --git a/test/regress/regress1/sygus/abduction_streq.readable.smt2 b/test/regress/regress1/sygus/abduction_streq.readable.smt2 index b6a422035..b466ab33e 100644 --- a/test/regress/regress1/sygus/abduction_streq.readable.smt2 +++ b/test/regress/regress1/sygus/abduction_streq.readable.smt2 @@ -1,4 +1,3 @@ -; REQUIRES: proof ; COMMAND-LINE: --produce-abducts --sygus-core-connective ; SCRUBBER: grep -v -E '(\(define-fun)' ; EXIT: 0 diff --git a/test/regress/regress1/sygus/array_search_2.sy b/test/regress/regress1/sygus/array_search_2.sy index c2404a12c..9009c8260 100644 --- a/test/regress/regress1/sygus/array_search_2.sy +++ b/test/regress/regress1/sygus/array_search_2.sy @@ -1,4 +1,3 @@ -; REQUIRES: proof ; EXPECT: unsat ; COMMAND-LINE: --lang=sygus2 --sygus-si=all --sygus-out=status (set-logic LIA) diff --git a/test/regress/run_regression.py b/test/regress/run_regression.py index fb4786331..01924559a 100755 --- a/test/regress/run_regression.py +++ b/test/regress/run_regression.py @@ -10,12 +10,6 @@ ## directory for licensing information. ## """ -Usage: - - run_regression.py [--enable-proof] [--with-lfsc] [--dump] - [--use-skip-return-code] [wrapper] cvc4-binary - [benchmark.cvc | benchmark.smt | benchmark.smt2 | benchmark.p] - Runs benchmark and checks for correct exit status and output. """ @@ -193,11 +187,6 @@ def run_regression(check_unsat_cores, check_proofs, dump, use_skip_return_code, cvc4_features, cvc4_disabled_features = get_cvc4_features(cvc4_binary) - # Disable proof and unsat core checks if CVC4 was not compiled with proofs. - if 'proof' not in cvc4_features: - check_unsat_cores = False - check_proofs = False - basic_command_line_args = [] benchmark_basename = os.path.basename(benchmark_path) diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 71568e337..f63f3f315 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -40,10 +40,6 @@ macro(cvc4_add_unit_test is_white name output_dir) target_link_libraries(${name} main-test) target_link_libraries(${name} GTest::GTest) target_link_libraries(${name} GTest::Main) - if(USE_LFSC) - # We don't link against LFSC, because CVC4 is already linked against it. - target_include_directories(${name} PRIVATE ${LFSC_INCLUDE_DIR}) - endif() if(USE_POLY) # We don't link against libpoly, because CVC4 is already linked against it. target_include_directories(${name} PRIVATE ${POLY_INCLUDE_DIR}) diff --git a/test/unit/api/solver_black.cpp b/test/unit/api/solver_black.cpp index 18a8f9cc8..6b6a0fa0f 100644 --- a/test/unit/api/solver_black.cpp +++ b/test/unit/api/solver_black.cpp @@ -1346,59 +1346,48 @@ TEST_F(TestApiBlackSolver, getOption) TEST_F(TestApiBlackSolver, getUnsatAssumptions1) { -#if IS_PROOFS_BUILD d_solver.setOption("incremental", "false"); d_solver.checkSatAssuming(d_solver.mkFalse()); ASSERT_THROW(d_solver.getUnsatAssumptions(), CVC4ApiException); -#endif } TEST_F(TestApiBlackSolver, getUnsatAssumptions2) { -#if IS_PROOFS_BUILD d_solver.setOption("incremental", "true"); d_solver.setOption("produce-unsat-assumptions", "false"); d_solver.checkSatAssuming(d_solver.mkFalse()); ASSERT_THROW(d_solver.getUnsatAssumptions(), CVC4ApiException); -#endif } TEST_F(TestApiBlackSolver, getUnsatAssumptions3) { -#if IS_PROOFS_BUILD d_solver.setOption("incremental", "true"); d_solver.setOption("produce-unsat-assumptions", "true"); d_solver.checkSatAssuming(d_solver.mkFalse()); ASSERT_NO_THROW(d_solver.getUnsatAssumptions()); d_solver.checkSatAssuming(d_solver.mkTrue()); ASSERT_THROW(d_solver.getUnsatAssumptions(), CVC4ApiException); -#endif } TEST_F(TestApiBlackSolver, getUnsatCore1) { -#if IS_PROOFS_BUILD d_solver.setOption("incremental", "false"); d_solver.assertFormula(d_solver.mkFalse()); d_solver.checkSat(); ASSERT_THROW(d_solver.getUnsatCore(), CVC4ApiException); -#endif } TEST_F(TestApiBlackSolver, getUnsatCore2) { -#if IS_PROOFS_BUILD d_solver.setOption("incremental", "false"); d_solver.setOption("produce-unsat-cores", "false"); d_solver.assertFormula(d_solver.mkFalse()); d_solver.checkSat(); ASSERT_THROW(d_solver.getUnsatCore(), CVC4ApiException); -#endif } TEST_F(TestApiBlackSolver, getUnsatCore3) { -#if IS_PROOFS_BUILD d_solver.setOption("incremental", "true"); d_solver.setOption("produce-unsat-cores", "true"); @@ -1434,9 +1423,8 @@ TEST_F(TestApiBlackSolver, getUnsatCore3) { d_solver.assertFormula(t); } - Result res = d_solver.checkSat(); + CVC4::api::Result res = d_solver.checkSat(); ASSERT_TRUE(res.isUnsat()); -#endif } TEST_F(TestApiBlackSolver, getValue1) |