From 55037e0bcef45c795f28ff3fcf6c1055af465c70 Mon Sep 17 00:00:00 2001 From: Andrew Reynolds Date: Thu, 15 Feb 2018 15:31:48 -0600 Subject: [PATCH] Refactor regressions (#1581) --- test/Makefile.am | 10 +- test/regress/regress0/Makefile.am | 44 +- test/regress/regress0/arith/Makefile.am | 14 - .../regress0/arith/integers/Makefile.am | 100 +--- test/regress/regress0/arrays/Makefile.am | 3 - test/regress/regress0/aufbv/Makefile.am | 1 - test/regress/regress0/bv/Makefile.am | 17 +- test/regress/regress0/datatypes/Makefile.am | 13 +- test/regress/regress0/datatypes/bug341.cvc | 5 - test/regress/regress0/datatypes/rec5.cvc | 204 ------- test/regress/regress0/decision/Makefile.am | 6 +- .../decision/quant-ex1.disable_miniscope.smt2 | 13 - .../quant-ex1.disable_miniscope.smt2.expect | 3 - test/regress/regress0/fmf/Makefile.am | 40 +- test/regress/regress0/ho/Makefile.am | 21 +- test/regress/regress0/nl/Makefile.am | 49 +- test/regress/regress0/push-pop/Makefile.am | 31 +- test/regress/regress0/push-pop/arith/Makefile | 8 - .../regress0/push-pop/arith/Makefile.am | 62 --- .../regress0/push-pop/boolean/Makefile.am | 35 +- test/regress/regress0/quantifiers/Makefile.am | 82 --- .../regress0/quantifiers/refcount24.cvc | 112 ---- test/regress/regress0/rels/Makefile.am | 38 -- .../regress/regress0/rewriterules/Makefile.am | 4 +- .../rewriterules/length_gen_1280.smt2 | 34 -- .../length_gen_1280_lemma_trigger.smt2 | 35 -- .../regress0/rewriterules/length_gen_160.smt2 | 34 -- .../length_gen_160_lemma_trigger.smt2 | 35 -- .../rewriterules/length_gen_160_sat.smt2 | 34 -- .../rewriterules/length_gen_2560.smt2 | 34 -- .../rewriterules/length_gen_2560_sat.smt2 | 34 -- .../regress0/rewriterules/length_gen_640.smt2 | 34 -- .../rewriterules/length_gen_640_lemma.smt2 | 34 -- .../rewriterules/length_gen_640_sat.smt2 | 34 -- .../rewriterules/length_gen_inv_1280.smt2 | 34 -- .../rewriterules/native_datatypes2.smt2 | 35 -- ...chability_back_to_the_future_extended.smt2 | 72 --- .../reachability_bbttf_eT_arrays.smt2 | 330 ----------- .../reachability_bttf_ext_Thomas.smt2 | 211 ------- .../test_efficient_ematching.smt2 | 35 -- .../why3_vstte10_max_sum_harness2_rr.smt2 | 508 ----------------- .../why3_vstte10_max_sum_harness3.smt2 | 492 ----------------- .../why3_vstte10_max_sum_harness3_rr.smt2 | 520 ------------------ test/regress/regress0/sep/Makefile.am | 27 - test/regress/regress0/sets/Makefile.am | 36 +- test/regress/regress0/strings/Makefile.am | 61 +- test/regress/regress0/subranges.cvc | 15 - test/regress/regress0/sygus/Makefile.am | 68 +-- test/regress/regress0/sygus/max.smt2 | 52 -- test/regress/regress0/uf/Makefile.am | 2 - test/regress/regress0/uflia/Makefile.am | 16 +- test/regress/regress0/uflra/Makefile.am | 6 +- .../regress0/unconstrained/Makefile.am | 2 - test/regress/regress1/Makefile.am | 55 +- test/regress/regress1/arith/Makefile.am | 139 +++++ .../arith}/arith-int-001.cvc | 0 .../arith}/arith-int-002.cvc | 0 .../arith}/arith-int-003.cvc | 0 .../arith}/arith-int-004.cvc | 0 .../arith}/arith-int-005.cvc | 0 .../arith}/arith-int-006.cvc | 0 .../arith}/arith-int-007.cvc | 0 .../arith}/arith-int-008.cvc | 0 .../arith}/arith-int-009.cvc | 0 .../arith}/arith-int-010.cvc | 0 .../arith}/arith-int-011.cvc | 0 .../arith}/arith-int-012.cvc | 0 .../arith}/arith-int-013.cvc | 0 .../arith}/arith-int-016.cvc | 0 .../arith}/arith-int-017.cvc | 0 .../arith}/arith-int-018.cvc | 0 .../arith}/arith-int-019.cvc | 0 .../arith}/arith-int-020.cvc | 0 .../arith}/arith-int-022.cvc | 0 .../arith}/arith-int-024.cvc | 0 .../arith}/arith-int-026.cvc | 0 .../arith}/arith-int-027.cvc | 0 .../arith}/arith-int-028.cvc | 0 .../arith}/arith-int-029.cvc | 0 .../arith}/arith-int-030.cvc | 0 .../arith}/arith-int-031.cvc | 0 .../arith}/arith-int-032.cvc | 0 .../arith}/arith-int-033.cvc | 0 .../arith}/arith-int-034.cvc | 0 .../arith}/arith-int-035.cvc | 0 .../arith}/arith-int-036.cvc | 0 .../arith}/arith-int-037.cvc | 0 .../arith}/arith-int-038.cvc | 0 .../arith}/arith-int-039.cvc | 0 .../arith}/arith-int-040.cvc | 0 .../arith}/arith-int-041.cvc | 0 .../arith}/arith-int-043.cvc | 0 .../arith}/arith-int-044.cvc | 0 .../arith}/arith-int-045.cvc | 0 .../arith}/arith-int-046.cvc | 0 .../arith}/arith-int-047.cvc | 0 .../arith}/arith-int-048.cvc | 0 .../arith}/arith-int-049.cvc | 0 .../arith}/arith-int-050.cvc | 0 .../arith}/arith-int-051.cvc | 0 .../arith}/arith-int-052.cvc | 0 .../arith}/arith-int-053.cvc | 0 .../arith}/arith-int-054.cvc | 0 .../arith}/arith-int-055.cvc | 0 .../arith}/arith-int-056.cvc | 0 .../arith}/arith-int-057.cvc | 0 .../arith}/arith-int-058.cvc | 0 .../arith}/arith-int-059.cvc | 0 .../arith}/arith-int-060.cvc | 0 .../arith}/arith-int-061.cvc | 0 .../arith}/arith-int-062.cvc | 0 .../arith}/arith-int-063.cvc | 0 .../arith}/arith-int-064.cvc | 0 .../arith}/arith-int-065.cvc | 0 .../arith}/arith-int-066.cvc | 0 .../arith}/arith-int-067.cvc | 0 .../arith}/arith-int-068.cvc | 0 .../arith}/arith-int-069.cvc | 0 .../arith}/arith-int-070.cvc | 0 .../arith}/arith-int-071.cvc | 0 .../arith}/arith-int-072.cvc | 0 .../arith}/arith-int-073.cvc | 0 .../arith}/arith-int-074.cvc | 0 .../arith}/arith-int-075.cvc | 0 .../arith}/arith-int-076.cvc | 0 .../arith}/arith-int-077.cvc | 0 .../arith}/arith-int-078.cvc | 0 .../arith}/arith-int-080.cvc | 0 .../arith}/arith-int-081.cvc | 0 .../arith}/arith-int-082.cvc | 0 .../arith}/arith-int-083.cvc | 0 .../arith}/arith-int-084.cvc | 0 .../arith}/arith-int-085.cvc | 0 .../arith}/arith-int-086.cvc | 0 .../arith}/arith-int-087.cvc | 0 .../arith}/arith-int-088.cvc | 0 .../arith}/arith-int-089.cvc | 0 .../arith}/arith-int-090.cvc | 0 .../arith}/arith-int-091.cvc | 0 .../arith}/arith-int-092.cvc | 0 .../arith}/arith-int-093.cvc | 0 .../arith}/arith-int-094.cvc | 0 .../arith}/arith-int-095.cvc | 0 .../arith}/arith-int-096.cvc | 0 .../arith}/arith-int-097.cvc | 0 .../arith}/arith-int-099.cvc | 0 .../arith}/arith-int-100.cvc | 0 .../arith/bug547.1.smt2 | 0 .../arith/bug716.0.smt2 | 0 .../{regress0 => regress1}/arith/bug716.1.cvc | 0 .../{regress0 => regress1}/arith/div.03.smt2 | 0 .../{regress0 => regress1}/arith/div.06.smt2 | 0 .../{regress0 => regress1}/arith/div.08.smt2 | 0 .../{regress0 => regress1}/arith/div.09.smt2 | 0 .../{regress0 => regress1}/arith/miplib3.cvc | 0 .../{regress0 => regress1}/arith/mod.02.smt2 | 0 .../{regress0 => regress1}/arith/mod.03.smt2 | 0 .../{regress0 => regress1}/arith/mult.02.smt2 | 0 .../arith/problem__003.smt2 | 0 .../arrayinuf_error.smt2 | 0 test/regress/regress1/aufbv/Makefile.am | 3 +- .../{regress0 => regress1}/aufbv/bug580.smt2 | 0 test/regress/regress1/auflia/Makefile.am | 3 +- .../{regress0 => regress1}/auflia/bug337.smt2 | 0 .../boolean-terms-kernel2.smt2 | 0 .../{regress0 => regress1}/boolean.cvc | 0 .../{regress0 => regress1}/bug216.smt2 | 0 .../{regress0 => regress1}/bug216.smt2.expect | 0 .../{regress0 => regress1}/bug296.smt2 | 0 .../{regress0 => regress1}/bug472.smt2 | 0 .../{regress0 => regress1}/bug507.smt2 | 0 .../{regress0 => regress1}/bug512.smt2 | 0 .../{regress0 => regress1}/bug516.smt2 | 0 .../{regress0 => regress1}/bug520.smt2 | 0 .../{regress0 => regress1}/bug543.smt2 | 0 .../{regress0 => regress1}/bug567.smt2 | 0 .../regress/{regress0 => regress1}/bug585.cvc | 0 .../{regress0 => regress1}/bug590.smt2 | 0 .../{regress0 => regress1}/bug590.smt2.expect | 0 .../{regress0 => regress1}/bug593.smt2 | 0 .../{regress0 => regress1}/bug681.smt2 | 0 .../bug694-Unapply1.scala-0.smt2 | 0 .../{regress0/uflra => regress1}/bug800.smt2 | 0 test/regress/regress1/bv/Makefile.am | 14 +- .../bv/bench_38.delta.smt2 | 0 .../{regress0 => regress1}/bv/bug787.smt2 | 0 .../bv/bug_extract_mult_leading_bit.smt2 | 0 .../bv/bv-int-collapse2-sat.smt2 | 0 .../bv/bv2nat-ground.smt2 | 0 .../bv/bv2nat-simp-range-sat.smt2 | 0 .../{regress0 => regress1}/bv/cmu-rdk-3.smt2 | 0 .../bv/decision-weight00.smt2 | 1 + .../{regress0 => regress1}/bv/divtest.smt2 | 0 .../{regress0 => regress1}/bv/unsound1.smt2 | 0 .../unconstrained => regress1}/bvdiv2.smt2 | 0 .../arrays => regress1}/constarr3.cvc | 0 .../arrays => regress1}/constarr3.smt2 | 0 .../crash_burn_locusts.smt2 | 0 test/regress/regress1/datatypes/Makefile.am | 6 +- .../datatypes/acyclicity-sr-ground096.smt2 | 0 .../datatypes/dt-color-2.6.smt2 | 0 .../datatypes/dt-param-card4-unsat.smt2 | 0 .../datatypes/error.cvc | 0 test/regress/regress1/decision/Makefile.am | 8 +- .../decision/quant-Arrays_Q1-noinfer.smt2 | 0 .../quant-Arrays_Q1-noinfer.smt2.expect | 0 .../decision/quant-symmetric_unsat_7.smt2 | 0 .../quant-symmetric_unsat_7.smt2.expect | 0 test/regress/{regress0 => regress1}/error.cvc | 0 .../{regress0 => regress1}/errorcrash.smt2 | 0 .../push-pop => regress1}/fmf-fun-dbu.smt2 | 0 .../{regress0 => regress1}/fmf/ALG008-1.smt2 | 0 .../fmf/LeftistHeap.scala-8-ncm.smt2 | 0 test/regress/regress1/fmf/Makefile.am | 41 +- .../{regress0 => regress1}/fmf/PUZ001+1.smt2 | 0 .../{regress0 => regress1}/fmf/agree466.smt2 | 0 .../{regress0 => regress1}/fmf/agree467.smt2 | 0 .../{regress0 => regress1}/fmf/alg202+1.smt2 | 0 .../fmf/am-bad-model.cvc | 0 .../fmf/bound-int-alt.smt2 | 0 .../{regress0 => regress1}/fmf/bug0909.smt2 | 0 .../{regress0 => regress1}/fmf/bug651.smt2 | 0 .../fmf/bug723-irrelevant-funs.smt2 | 0 .../{regress0 => regress1}/fmf/bug764.smt2 | 0 .../fmf/cons-sets-bounds.smt2 | 0 .../fmf/constr-ground-to.smt2 | 0 .../fmf/datatypes-ufinite-nested.smt2 | 0 .../fmf/datatypes-ufinite.smt2 | 0 .../fmf/dt-proper-model.smt2 | 0 .../fmf/fc-pigeonhole19.smt2 | 0 .../{regress0 => regress1}/fmf/fib-core.smt2 | 0 .../fmf/fmf-bound-2dim.smt2 | 0 .../fmf/fmf-bound-int.smt2 | 0 .../fmf/fmf-fun-no-elim-ext-arith.smt2 | 0 .../fmf/fmf-fun-no-elim-ext-arith2.smt2 | 0 .../fmf/fmf-strange-bounds.smt2 | 0 .../fmf/forall_unit_data.smt2 | 2 +- .../fmf/fore19-exp2-core.smt2 | 0 .../{regress0 => regress1}/fmf/german169.smt2 | 0 .../{regress0 => regress1}/fmf/german73.smt2 | 0 .../fmf/issue916-fmf-or.smt2 | 0 .../fmf/jasmin-cdt-crash.smt2 | 0 .../fmf/ko-bound-set.cvc | 0 .../fmf/loopy_coda.smt2 | 0 .../fmf/lst-no-self-rev-exp.smt2 | 0 .../fmf/memory_model-R_cpp-dd.cvc | 0 .../fmf/nun-0208-to.smt2 | 0 .../{regress0 => regress1}/fmf/pow2-bool.smt2 | 0 .../fmf/refcount24.cvc.smt2 | 0 .../fmf/sc-crash-052316.smt2 | 0 .../fmf/with-ind-104-core.smt2 | 0 .../uf => regress1}/gensys_brn001.smt2 | 0 test/regress/regress1/ho/Makefile.am | 35 ++ .../{regress0 => regress1}/ho/auth0068.smt2 | 0 .../{regress0 => regress1}/ho/fta0409.smt2 | 0 .../ho/ho-exponential-model.smt2 | 0 .../ho/ho-matching-enum-2.smt2 | 0 .../{regress0 => regress1}/ho/ho-std-fmf.smt2 | 0 .../{regress0 => regress1}/ho/hoa0102.smt2 | 0 test/regress/{regress0 => regress1}/hole6.cvc | 0 .../issue1048-arrays-int-real.smt2 | 0 test/regress/{regress0 => regress1}/ite5.smt2 | 0 test/regress/regress1/nl/Makefile.am | 49 +- .../nl/nta => regress1/nl}/NAVIGATION2.smt2 | 0 .../nl}/arrowsmith-050317.smt2 | 0 .../nl/nta => regress1/nl}/bad-050217.smt2 | 0 .../{regress0 => regress1}/nl/bug698.smt2 | 0 .../nl/coeff-unsat-base.smt2 | 0 .../nl/coeff-unsat.smt2 | 0 .../{regress0 => regress1}/nl/combine.smt2 | 0 .../nl/nta => regress1/nl}/cos-bound.smt2 | 0 .../nl/nta => regress1/nl}/cos1-tc.smt2 | 0 .../{regress0 => regress1}/nl/disj-eval.smt2 | 0 .../{regress0 => regress1}/nl/dist-big.smt2 | 0 .../nl/div-mod-partial.smt2 | 0 ...libre_artes_ex_5_13.transcendental.k2.smt2 | 0 .../nl/nta => regress1/nl}/exp-4.5-lt.smt2 | 0 .../nl/nta => regress1/nl}/exp1-lb.smt2 | 0 .../nl/nta => regress1/nl}/exp_monotone.smt2 | 0 .../nl/metitarski-1025.smt2 | 0 .../nl/metitarski-3-4.smt2 | 0 .../nl/metitarski_3_4_2e.smt2 | 0 .../nl/nl-help-unsat-quant.smt2 | 0 .../nl/nl-unk-quant.smt2 | 0 .../{regress0 => regress1}/nl/ones.smt2 | 0 .../{regress0 => regress1}/nl/poly-1025.smt2 | 0 .../{regress0 => regress1}/nl/quant-nl.smt2 | 0 .../{regress0 => regress1}/nl/red-exp.smt2 | 0 .../nl/rewriting-sums.smt2 | 0 .../nl/nta => regress1/nl}/shifting.smt2 | 0 .../nl/nta => regress1/nl}/shifting2.smt2 | 0 .../nl/simple-mono-unsat.smt2 | 0 .../nl/simple-mono.smt2 | 0 .../nl}/sin-compare-across-phase.smt2 | 0 .../nl/nta => regress1/nl}/sin-compare.smt2 | 0 .../nl}/sin-init-tangents.smt2 | 0 .../nl/nta => regress1/nl}/sin-sign.smt2 | 0 .../nl/nta => regress1/nl}/sin-sym2.smt2 | 0 .../nl/nta => regress1/nl}/sin1-lb.smt2 | 0 .../nl/nta => regress1/nl}/sin1-sat.smt2 | 0 .../nl/nta => regress1/nl}/sin1-ub.smt2 | 0 .../nl/nta => regress1/nl}/sin2-lb.smt2 | 0 .../nl/nta => regress1/nl}/sin2-ub.smt2 | 0 .../nl/sqrt-problem-1.smt2 | 0 .../nl/nta => regress1/nl}/sugar-ident-2.smt2 | 0 .../nl/nta => regress1/nl}/sugar-ident-3.smt2 | 0 .../nl/nta => regress1/nl}/sugar-ident.smt2 | 0 .../nl/nta => regress1/nl}/tan-rewrite2.smt2 | 0 .../nl/zero-subset.smt2 | 0 .../non-fatal-errors.smt2 | 0 .../arrays => regress1}/parsing_ringer.cvc | 0 .../{regress0/uf => regress1}/proof00.smt2 | 0 test/regress/regress1/push-pop/Makefile.am | 92 ++++ .../push-pop/arith_lra_01.smt2 | 0 .../push-pop/arith_lra_02.smt2 | 0 .../push-pop/bug-fmf-fun-skolem.smt2 | 0 .../push-pop/bug216.smt2 | 0 .../push-pop/bug216.smt2.expect | 0 .../push-pop/bug326.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_1.smt2 | 0 .../push-pop}/fuzz_10.smt2 | 0 .../push-pop}/fuzz_11.smt2 | 0 .../push-pop}/fuzz_15.smt2 | 0 .../push-pop}/fuzz_16.smt2 | 0 .../push-pop}/fuzz_19.smt2 | 0 .../push-pop}/fuzz_1_to_52_merged.smt2 | 0 .../push-pop}/fuzz_20.smt2 | 0 .../push-pop}/fuzz_23.smt2 | 0 .../push-pop}/fuzz_24.smt2 | 0 .../push-pop}/fuzz_25.smt2 | 0 .../push-pop}/fuzz_26.smt2 | 0 .../push-pop}/fuzz_28.smt2 | 0 .../push-pop}/fuzz_29.smt2 | 0 .../push-pop}/fuzz_30.smt2 | 0 .../push-pop}/fuzz_32.smt2 | 0 .../push-pop}/fuzz_34.smt2 | 0 .../push-pop}/fuzz_35.smt2 | 0 .../push-pop}/fuzz_37.smt2 | 0 .../push-pop}/fuzz_39.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_1.smt2 | 0 .../push-pop}/fuzz_3_10.smt2 | 0 .../push-pop}/fuzz_3_11.smt2 | 0 .../push-pop}/fuzz_3_12.smt2 | 0 .../push-pop}/fuzz_3_13.smt2 | 0 .../push-pop}/fuzz_3_14.smt2 | 0 .../push-pop}/fuzz_3_15.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_2.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_3.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_4.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_5.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_6.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_7.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_8.smt2 | 0 .../arith => regress1/push-pop}/fuzz_3_9.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_4.smt2 | 0 .../push-pop}/fuzz_40.smt2 | 0 .../push-pop}/fuzz_41.smt2 | 0 .../push-pop}/fuzz_42.smt2 | 0 .../push-pop}/fuzz_43.smt2 | 0 .../push-pop}/fuzz_44.smt2 | 0 .../push-pop}/fuzz_45.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_5.smt2 | 0 .../push-pop}/fuzz_51.smt2 | 0 .../push-pop}/fuzz_52.smt2 | 0 .../arith => regress1/push-pop}/fuzz_5_1.smt2 | 0 .../arith => regress1/push-pop}/fuzz_5_2.smt2 | 0 .../arith => regress1/push-pop}/fuzz_5_3.smt2 | 0 .../arith => regress1/push-pop}/fuzz_5_4.smt2 | 0 .../arith => regress1/push-pop}/fuzz_5_5.smt2 | 0 .../arith => regress1/push-pop}/fuzz_5_6.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_6.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_7.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_8.smt2 | 0 .../boolean => regress1/push-pop}/fuzz_9.smt2 | 0 .../push-pop/quant-fun-proc-unmacro.smt2 | 0 .../push-pop/quant-fun-proc.smt2 | 0 .../quantifiers/006-cbqi-ite.smt2 | 0 .../AdditiveMethods_OwnedResults.Mz.smt2 | 0 .../quantifiers/Arrays_Q1-noinfer.smt2 | 0 test/regress/regress1/quantifiers/Makefile.am | 75 ++- .../quantifiers/NUM878.smt2 | 0 .../quantifiers/RND-small.smt2 | 0 .../quantifiers/RNDPRE_4_1-dd-nqe.smt2 | 0 .../quantifiers/RND_4_16.smt2 | 0 .../quantifiers/anti-sk-simp.smt2 | 0 .../quantifiers/ari118-bv-2occ-x.smt2 | 0 .../quantifiers/array-unsat-simp3.smt2 | 0 .../quantifiers/bi-artm-s.smt2 | 0 .../quantifiers/bignum_quant.smt2 | 0 .../quantifiers/bug822.smt2 | 0 .../quantifiers/bug_743.smt2 | 0 .../quantifiers/burns13.smt2 | 0 .../quantifiers/burns4.smt2 | 0 .../quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 | 0 .../quantifiers/cdt-0208-to.smt2 | 0 .../quantifiers/ext-ex-deq-trigger.smt2 | 0 .../quantifiers/extract-nproc.smt2 | 0 .../quantifiers/florian-case-ax.smt2 | 0 .../quantifiers/gauss_init_0030.fof.smt2 | 0 .../quantifiers/inst-max-level-segf.smt2 | 0 ...ction-example-onelane.proof-node22337.smt2 | 0 .../quantifiers/is-even.smt2 | 0 .../quantifiers/javafe.ast.StmtVec.009.smt2 | 0 .../quantifiers/macro-subtype-param.smt2 | 0 .../quantifiers/mix-coeff.smt2 | 0 .../quantifiers/model_6_1_bv.smt2 | 0 .../nested9_true-unreach-call.i_575.smt2 | 0 .../quantifiers/opisavailable-12.smt2 | 0 .../quantifiers/parametric-lists.smt2 | 0 .../quantifiers/psyco-001-bv.smt2 | 0 .../quantifiers/psyco-107-bv.smt2 | 0 .../quantifiers/psyco-196.smt2 | 0 .../quantifiers/qbv-disequality3.smt2 | 0 .../quantifiers/qbv-simple-2vars-vo.smt2 | 0 .../quantifiers/qbv-test-invert-bvashr-0.smt2 | 0 .../quantifiers/qbv-test-invert-bvashr-1.smt2 | 0 .../quantifiers/qbv-test-invert-bvcomp.smt2 | 0 .../quantifiers/qbv-test-invert-bvlshr-1.smt2 | 0 .../qbv-test-invert-bvmul-neq.smt2 | 0 .../quantifiers/qbv-test-invert-bvmul.smt2 | 0 .../qbv-test-invert-bvudiv-0-neq.smt2 | 0 .../quantifiers/qbv-test-invert-bvudiv-0.smt2 | 0 .../qbv-test-invert-bvudiv-1-neq.smt2 | 0 .../quantifiers/qbv-test-invert-bvudiv-1.smt2 | 0 .../qbv-test-invert-bvurem-1-neq.smt2 | 0 .../quantifiers/qbv-test-invert-bvurem-1.smt2 | 0 .../quantifiers/qbv-test-urem-rewrite.smt2 | 0 .../qcft-javafe.filespace.TreeWalker.006.smt2 | 0 .../quantifiers/qcft-smtlib3dbc51.smt2 | 0 .../quaternion_ds1_symm_0428.fof.smt2 | 0 .../quantifiers/rew-to-0211-dd.smt2 | 0 .../quantifiers/ricart-agrawala6.smt2 | 0 .../quantifiers/set3.smt2 | 0 .../quantifiers/set8.smt2 | 0 .../small-pipeline-fixpoint-3.smt2 | 0 .../quantifiers/smtlib384a03.smt2 | 0 .../quantifiers/smtlib46f14a.smt2 | 0 .../quantifiers/smtlibf957ea.smt2 | 0 .../quantifiers/stream-x2014-09-18-unsat.smt2 | 0 .../quantifiers/subtype-param-unk.smt2 | 0 .../quantifiers/subtype-param.smt2 | 0 .../quantifiers/symmetric_unsat_7.smt2 | 0 .../quantifiers/z3.620661-no-fv-trigger.smt2 | 0 test/regress/regress1/rels/Makefile.am | 66 +++ .../rels/addr_book_1.cvc | 0 .../rels/addr_book_1_1.cvc | 0 .../{regress0 => regress1}/rels/bv1-unit.cvc | 0 .../{regress0 => regress1}/rels/bv1-unitb.cvc | 0 .../{regress0 => regress1}/rels/bv1.cvc | 0 .../{regress0 => regress1}/rels/bv1p-sat.cvc | 0 .../{regress0 => regress1}/rels/bv1p.cvc | 0 .../{regress0 => regress1}/rels/bv2.cvc | 0 .../rels/garbage_collect.cvc | 0 .../{regress0 => regress1}/rels/iden_1_1.cvc | 0 .../rels/join-eq-structure-and.cvc | 0 .../rels/join-eq-structure.cvc | 0 .../rels/join-eq-structure_0_1.cvc | 0 .../rels/joinImg_0_1.cvc | 0 .../rels/joinImg_0_2.cvc | 0 .../{regress0 => regress1}/rels/joinImg_1.cvc | 0 .../rels/joinImg_1_1.cvc | 0 .../{regress0 => regress1}/rels/joinImg_2.cvc | 0 .../rels/joinImg_2_1.cvc | 0 .../rels/prod-mod-eq.cvc | 0 .../rels/prod-mod-eq2.cvc | 0 .../rels/rel_complex_3.cvc | 0 .../rels/rel_complex_4.cvc | 0 .../rels/rel_complex_5.cvc | 0 .../rels/rel_mix_0_1.cvc | 0 .../rels/rel_pressure_0.cvc | 0 .../rels/rel_tc_10_1.cvc | 0 .../{regress0 => regress1}/rels/rel_tc_4.cvc | 0 .../rels/rel_tc_4_1.cvc | 0 .../rels/rel_tc_5_1.cvc | 0 .../{regress0 => regress1}/rels/rel_tc_6.cvc | 0 .../rels/rel_tc_9_1.cvc | 0 .../{regress0 => regress1}/rels/rel_tp_2.cvc | 0 .../rels/rel_tp_join_2_1.cvc | 0 .../{regress0 => regress1}/rels/set-strat.cvc | 0 .../{regress0 => regress1}/rels/strat.cvc | 0 .../{regress0 => regress1}/rels/strat_0_1.cvc | 0 .../regress/regress1/rewriterules/Makefile.am | 28 +- .../rewriterules/datatypes2.smt2 | 0 .../rewriterules/datatypes3.smt2 | 0 .../datatypes_clark_quantification.smt2 | 0 .../rewriterules/datatypes_sat.smt2 | 0 .../rewriterules/length_gen.smt2 | 0 .../rewriterules/length_gen_010.smt2 | 0 .../rewriterules/length_gen_010_lemma.smt2 | 0 .../rewriterules/length_gen_020.smt2 | 0 .../rewriterules/length_gen_020_sat.smt2 | 0 .../rewriterules/length_gen_040.smt2 | 0 .../rewriterules/length_gen_040_lemma.smt2 | 0 .../length_gen_040_lemma_trigger.smt2 | 0 .../rewriterules/length_gen_080.smt2 | 0 .../rewriterules/length_gen_160_lemma.smt2 | 0 .../rewriterules/length_gen_inv_160.smt2 | 0 .../rewriterules/length_trick3.smt2 | 0 .../rewriterules/length_trick3_int.smt2 | 0 .../set_A_new_fast_tableau-base.smt2 | 0 .../set_A_new_fast_tableau-base_sat.smt2 | 0 .../rewriterules/test_guards.smt2 | 0 .../why3_vstte10_max_sum_harness2.smt2 | 0 test/regress/regress1/sep/Makefile.am | 29 +- .../{regress0 => regress1}/sep/chain-int.smt2 | 0 .../{regress0 => regress1}/sep/crash1220.smt2 | 0 .../sep/dispose-list-4-init.smt2 | 0 .../sep/emp2-quant-unsat.smt2 | 0 .../sep/finite-witness-sat.smt2 | 0 .../sep/fmf-nemp-2.smt2 | 0 .../{regress0 => regress1}/sep/pto-04.smt2 | 0 .../sep/quant_wand.smt2 | 0 .../{regress0 => regress1}/sep/sep-02.smt2 | 0 .../{regress0 => regress1}/sep/sep-03.smt2 | 0 .../{regress0 => regress1}/sep/sep-find2.smt2 | 0 .../sep/sep-fmf-priority.smt2 | 0 .../sep/sep-neg-1refine.smt2 | 0 .../sep/sep-neg-nstrict.smt2 | 0 .../sep/sep-neg-nstrict2.smt2 | 0 .../sep/sep-neg-simple.smt2 | 0 .../sep/sep-neg-swap.smt2 | 0 .../sep/sep-nterm-again.smt2 | 0 .../sep/sep-nterm-val-model.smt2 | 0 .../sep/simple-neg-sat.smt2 | 0 .../sep/wand-0526-sat.smt2 | 0 .../sep/wand-false.smt2 | 0 .../sep/wand-nterm-simp.smt2 | 0 .../sep/wand-nterm-simp2.smt2 | 0 .../sep/wand-simp-sat.smt2 | 0 .../sep/wand-simp-sat2.smt2 | 0 .../sep/wand-simp-unsat.smt2 | 0 .../sets}/ListElem.hs.fqout.cvc4.38.smt2 | 0 .../sets}/ListElts.hs.fqout.cvc4.317.smt2 | 0 test/regress/regress1/sets/Makefile.am | 31 +- .../TalkingAboutSets.hs.fqout.cvc4.3577.smt2 | 0 .../UniqueZipper.hs.1030minimized.cvc4.smt2 | 0 .../UniqueZipper.hs.1030minimized2.cvc4.smt2 | 0 .../sets}/UniqueZipper.hs.fqout.cvc4.10.smt2 | 0 .../UniqueZipper.hs.fqout.cvc4.1832.smt2 | 0 .../sets/arjun-set-univ.cvc | 0 .../{regress0 => regress1}/sets/card-3.smt2 | 0 .../{regress0 => regress1}/sets/card-4.smt2 | 0 .../{regress0 => regress1}/sets/card-5.smt2 | 0 .../{regress0 => regress1}/sets/card-6.smt2 | 0 .../{regress0 => regress1}/sets/card-7.smt2 | 0 .../sets/copy_check_heap_access_33_4.smt2 | 0 .../sets}/deepmeas0.hs.fqout.cvc4.41.smt2 | 0 .../sets/fuzz14418.smt2 | 0 .../sets/fuzz15201.smt2 | 0 .../sets/fuzz31811.smt2 | 0 .../sets}/insert_invariant_37_2.smt2 | 0 .../sets}/lemmabug-ListElts317minimized.smt2 | 0 .../sets}/remove_check_free_31_6.smt2 | 0 .../sets/setofsets-disequal.smt2 | 0 .../sets/sets-tuple-poly.cvc | 0 .../sets/sharingbug.smt2 | 0 .../sets/univ-set-uf-elim.smt2 | 0 .../simple-rdl-definefun.smt2 | 0 .../simplification_bug4.smt2 | 0 .../simplification_bug4.smt2.expect | 0 .../sqrt2-sort-inf-unk.smt2 | 0 test/regress/regress1/strings/Makefile.am | 57 +- .../strings/artemis-0512-nonterm.smt2 | 0 .../{regress0 => regress1}/strings/at001.smt2 | 0 .../strings/bug615.smt2 | 0 .../strings/bug682.smt2 | 0 .../strings/bug686dd.smt2 | 0 .../strings/bug768.smt2 | 0 .../strings/bug799-min.smt2 | 0 .../strings/chapman150408.smt2 | 0 .../strings/cmu-2db2-extf-reg.smt2 | 0 .../strings/cmu-disagree-0707-dd.smt2 | 0 .../strings/cmu-inc-nlpp-071516.smt2 | 0 .../strings/cmu-substr-rw.smt2 | 0 .../strings/crash-1019.smt2 | 0 .../strings/csp-prefix-exp-bug.smt2 | 0 .../strings/fmf001.smt2 | 0 .../strings/fmf002.smt2 | 0 .../strings/gm-inc-071516-2.smt2 | 0 .../strings/idof-handg.smt2 | 0 .../strings/idof-nconst-index.smt2 | 0 .../strings/idof-neg-index.smt2 | 0 .../strings/idof-triv.smt2 | 0 .../strings/ilc-l-nt.smt2 | 0 .../strings/issue1105.smt2 | 0 .../strings/kaluza-fl.smt2 | 0 .../strings/loop002.smt2 | 0 .../strings/loop003.smt2 | 0 .../strings/loop004.smt2 | 0 .../strings/loop005.smt2 | 0 .../strings/loop006.smt2 | 0 .../strings/loop007.smt2 | 0 .../strings/loop008.smt2 | 0 .../strings/loop009.smt2 | 0 .../strings/nf-ff-contains-abs.smt2 | 0 .../strings/norn-360.smt2 | 0 .../strings/norn-ab.smt2 | 0 .../strings/norn-nel-bug-052116.smt2 | 0 .../strings/norn-simp-rew-sat.smt2 | 0 .../strings/pierre150331.smt2 | 0 .../strings/regexp001.smt2 | 0 .../strings/regexp002.smt2 | 0 .../strings/regexp003.smt2 | 0 .../strings/reloop.smt2 | 0 .../strings/repl-empty-sem.smt2 | 0 .../strings/repl-soundness-sem.smt2 | 0 .../strings/str001.smt2 | 0 .../strings/str002.smt2 | 0 .../strings/str006.smt2 | 0 .../strings/str007.smt2 | 0 .../strings/strings-index-empty.smt2 | 0 .../strings/strip-endpt-sound.smt2 | 0 .../strings/substr001.smt2 | 0 .../strings/type002.smt2 | 0 .../strings/type003.smt2 | 0 .../strings/username_checker_min.smt2 | 0 .../{regress0 => regress1}/sygus/Base16_1.sy | 0 test/regress/regress1/sygus/Makefile.am | 60 +- .../sygus/array_search_2.sy | 0 .../sygus/array_sum_2_5.sy | 0 .../{regress0 => regress1}/sygus/cegar1.sy | 0 .../{regress0 => regress1}/sygus/cggmp.sy | 0 .../sygus/clock-inc-tuple.sy | 0 .../sygus/commutative.sy | 0 .../{regress0 => regress1}/sygus/constant.sy | 0 .../sygus/dt-test-ns.sy | 0 .../{regress0 => regress1}/sygus/dup-op.sy | 0 .../{regress0 => regress1}/sygus/enum-test.sy | 0 .../sygus/fg_polynomial3.sy | 0 .../sygus/hd-01-d1-prog.sy | 0 .../sygus/hd-19-d1-prog-dup-op.sy | 0 .../sygus/icfp_14.12-flip-args.sy | 0 .../sygus/icfp_14.12.sy | 0 .../sygus/icfp_28_10.sy | 0 .../sygus/icfp_easy-ite.sy | 0 .../sygus/inv-example.sy | 0 .../sygus/inv-unused.sy | 0 .../sygus/list-head-x.sy | 0 .../{regress0 => regress1}/sygus/max.sy | 0 .../sygus/multi-fun-polynomial2.sy | 0 .../sygus/nflat-fwd-3.sy | 0 .../{regress0 => regress1}/sygus/nflat-fwd.sy | 0 .../sygus/nia-max-square-ns.sy | 0 .../sygus/no-flat-simp.sy | 0 .../sygus/no-mention.sy | 0 .../sygus/process-10-vars.sy | 0 .../{regress0 => regress1}/sygus/qe.sy | 0 .../sygus/strings-concat-3-args.sy | 0 .../sygus/strings-double-rec.sy | 0 .../sygus/strings-small.sy | 0 .../sygus/strings-template-infer-unused.sy | 0 .../sygus/strings-template-infer.sy | 0 .../sygus/strings-trivial-simp.sy | 0 .../sygus/strings-trivial-two-type.sy | 0 .../sygus/strings-trivial.sy | 0 .../{regress0 => regress1}/sygus/sygus-dt.sy | 0 .../{regress0 => regress1}/sygus/tl-type-0.sy | 0 .../sygus/tl-type-4x.sy | 0 .../{regress0 => regress1}/sygus/tl-type.sy | 0 .../sygus/triv-type-mismatch-si.sy | 0 .../{regress0 => regress1}/sygus/twolets1.sy | 0 .../sygus/twolets2-orig.sy | 0 .../sygus/unbdd_inv_gen_winf1.sy | 0 .../regress/{regress0 => regress1}/test12.cvc | 0 test/regress/{regress0 => regress1}/trim.cvc | 0 .../unconstrained => regress1}/uf2.smt2 | 0 .../uflia/DRAGON_11_e1_2450.ec.minimized.smt2 | 0 ...DRAGON_11_e1_2450.ec.minimized.smt2.expect | 0 .../FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 | 0 ...EFLY_3_e2_2236_e7_3681.ec.core.smt2.expect | 0 ..._luke_1b_e2_3049_e7_1173.ec.minimized.smt2 | 0 test/regress/regress1/uflia/Makefile.am | 41 ++ .../uflia/microwave21.ec.minimized.smt2 | 0 .../uflia/simple_cyclic2.smt2 | 0 .../uflia/speed2_e8_449_e8_517.ec.smt2 | 0 .../uflia/speed2_e8_449_e8_517.ec.smt2.expect | 0 .../uflia/stalmark_e7_27_e7_31.ec.smt2 | 0 .../uflia/stalmark_e7_27_e7_31.ec.smt2.expect | 0 test/regress/regress2/Makefile.am | 15 +- test/regress/regress2/arith/Makefile.am | 6 +- .../arith}/arith-int-098.cvc | 0 .../arith/miplib-opt1217--27.smt2 | 0 .../arith/miplib-pp08a-3000.smt2 | 0 .../push-pop => regress2}/bug396.smt2 | 0 .../push-pop => regress2}/bug674.smt2 | 0 .../push-pop => regress2}/bug765.smt2 | 0 ...ast.StandardPrettyPrint.319_no_forall.smt2 | 0 .../javafe.ast.WhileStmt.447_no_forall.smt2 | 0 test/regress/regress2/nl/Makefile.am | 33 ++ .../nta => regress2/nl}/dumortier-050317.smt2 | 0 .../nl/nt-lemmas-bad.smt2 | 0 .../nl/siegel-nl-bases.smt2 | 0 ...AdditiveMethods_AdditiveMethods..ctor.smt2 | 0 .../quantifiers}/ForElimination-scala-9.smt2 | 0 test/regress/regress2/quantifiers/Makefile.am | 38 ++ .../quantifiers/javafe.ast.ArrayInit.35.smt2 | 0 .../javafe.ast.StandardPrettyPrint.319.smt2 | 0 .../quantifiers/javafe.ast.WhileStmt.447.smt2 | 0 .../javafe.tc.CheckCompilationUnit.001.smt2 | 0 .../javafe.tc.FlowInsensitiveChecks.682.smt2 | 0 .../quantifiers}/nunchaku2309663.nun.min.smt2 | 0 .../quantifiers/small-bug1-fixpoint-3.smt2 | 0 ....ArrayInit.35_without_quantification2.smt2 | 0 test/regress/regress2/strings/Makefile.am | 34 ++ .../strings/cmu-dis-0707-3.smt2 | 0 .../strings/cmu-prereg-fmf.smt2 | 0 .../strings/cmu-repl-len-nterm.smt2 | 0 .../strings/norn-dis-0707-3.smt2 | 0 .../{regress1 => regress2}/sygus/MPwL_d1s3.sy | 0 test/regress/regress2/sygus/Makefile.am | 42 ++ .../sygus/array_sum_dd.sy | 0 .../sygus/icfp_easy_mt_ite.sy | 0 .../sygus/inv_gen_n_c11.sy | 0 .../sygus/lustre-real.sy | 0 .../{regress0 => regress2}/sygus/max2-univ.sy | 0 .../sygus/mpg_guard1-dd.sy | 0 .../sygus/nia-max-square.sy | 0 .../sygus/no-syntax-test-no-si.sy | 0 .../sygus/process-10-vars-2fun.sy | 0 .../sygus/process-arg-invariance.sy | 0 .../sygus/real-grammar-neg.sy | 0 .../{regress1 => regress2}/sygus/three.sy | 0 722 files changed, 998 insertions(+), 3784 deletions(-) delete mode 100644 test/regress/regress0/datatypes/bug341.cvc delete mode 100644 test/regress/regress0/datatypes/rec5.cvc delete mode 100644 test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2 delete mode 100644 test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2.expect delete mode 100644 test/regress/regress0/push-pop/arith/Makefile delete mode 100644 test/regress/regress0/push-pop/arith/Makefile.am delete mode 100644 test/regress/regress0/quantifiers/refcount24.cvc delete mode 100644 test/regress/regress0/rewriterules/length_gen_1280.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_1280_lemma_trigger.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_160.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_160_lemma_trigger.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_160_sat.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_2560.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_2560_sat.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_640.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_640_lemma.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_640_sat.smt2 delete mode 100644 test/regress/regress0/rewriterules/length_gen_inv_1280.smt2 delete mode 100644 test/regress/regress0/rewriterules/native_datatypes2.smt2 delete mode 100644 test/regress/regress0/rewriterules/reachability_back_to_the_future_extended.smt2 delete mode 100644 test/regress/regress0/rewriterules/reachability_bbttf_eT_arrays.smt2 delete mode 100644 test/regress/regress0/rewriterules/reachability_bttf_ext_Thomas.smt2 delete mode 100644 test/regress/regress0/rewriterules/test_efficient_ematching.smt2 delete mode 100644 test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness2_rr.smt2 delete mode 100644 test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3.smt2 delete mode 100644 test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3_rr.smt2 delete mode 100644 test/regress/regress0/subranges.cvc delete mode 100644 test/regress/regress0/sygus/max.smt2 create mode 100644 test/regress/regress1/arith/Makefile.am rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-001.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-002.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-003.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-004.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-005.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-006.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-007.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-008.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-009.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-010.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-011.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-012.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-013.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-016.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-017.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-018.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-019.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-020.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-022.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-024.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-026.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-027.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-028.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-029.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-030.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-031.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-032.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-033.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-034.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-035.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-036.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-037.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-038.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-039.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-040.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-041.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-043.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-044.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-045.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-046.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-047.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-048.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-049.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-050.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-051.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-052.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-053.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-054.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-055.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-056.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-057.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-058.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-059.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-060.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-061.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-062.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-063.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-064.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-065.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-066.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-067.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-068.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-069.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-070.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-071.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-072.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-073.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-074.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-075.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-076.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-077.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-078.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-080.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-081.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-082.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-083.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-084.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-085.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-086.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-087.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-088.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-089.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-090.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-091.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-092.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-093.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-094.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-095.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-096.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-097.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-099.cvc (100%) rename test/regress/{regress0/arith/integers => regress1/arith}/arith-int-100.cvc (100%) rename test/regress/{regress0 => regress1}/arith/bug547.1.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/bug716.0.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/bug716.1.cvc (100%) rename test/regress/{regress0 => regress1}/arith/div.03.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/div.06.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/div.08.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/div.09.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/miplib3.cvc (100%) rename test/regress/{regress0 => regress1}/arith/mod.02.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/mod.03.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/mult.02.smt2 (100%) rename test/regress/{regress0 => regress1}/arith/problem__003.smt2 (100%) rename test/regress/{regress0 => regress1}/arrayinuf_error.smt2 (100%) rename test/regress/{regress0 => regress1}/aufbv/bug580.smt2 (100%) rename test/regress/{regress0 => regress1}/auflia/bug337.smt2 (100%) rename test/regress/{regress0 => regress1}/boolean-terms-kernel2.smt2 (100%) rename test/regress/{regress0 => regress1}/boolean.cvc (100%) rename test/regress/{regress0 => regress1}/bug216.smt2 (100%) rename test/regress/{regress0 => regress1}/bug216.smt2.expect (100%) rename test/regress/{regress0 => regress1}/bug296.smt2 (100%) rename test/regress/{regress0 => regress1}/bug472.smt2 (100%) rename test/regress/{regress0 => regress1}/bug507.smt2 (100%) rename test/regress/{regress0 => regress1}/bug512.smt2 (100%) rename test/regress/{regress0 => regress1}/bug516.smt2 (100%) rename test/regress/{regress0 => regress1}/bug520.smt2 (100%) rename test/regress/{regress0 => regress1}/bug543.smt2 (100%) rename test/regress/{regress0 => regress1}/bug567.smt2 (100%) rename test/regress/{regress0 => regress1}/bug585.cvc (100%) rename test/regress/{regress0 => regress1}/bug590.smt2 (100%) rename test/regress/{regress0 => regress1}/bug590.smt2.expect (100%) rename test/regress/{regress0 => regress1}/bug593.smt2 (100%) rename test/regress/{regress0 => regress1}/bug681.smt2 (100%) rename test/regress/{regress0/push-pop => regress1}/bug694-Unapply1.scala-0.smt2 (100%) rename test/regress/{regress0/uflra => regress1}/bug800.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/bench_38.delta.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/bug787.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/bug_extract_mult_leading_bit.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/bv-int-collapse2-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/bv2nat-ground.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/bv2nat-simp-range-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/cmu-rdk-3.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/decision-weight00.smt2 (96%) rename test/regress/{regress0 => regress1}/bv/divtest.smt2 (100%) rename test/regress/{regress0 => regress1}/bv/unsound1.smt2 (100%) rename test/regress/{regress0/unconstrained => regress1}/bvdiv2.smt2 (100%) rename test/regress/{regress0/arrays => regress1}/constarr3.cvc (100%) rename test/regress/{regress0/arrays => regress1}/constarr3.smt2 (100%) rename test/regress/{regress0 => regress1}/crash_burn_locusts.smt2 (100%) rename test/regress/{regress0 => regress1}/datatypes/acyclicity-sr-ground096.smt2 (100%) rename test/regress/{regress0 => regress1}/datatypes/dt-color-2.6.smt2 (100%) rename test/regress/{regress0 => regress1}/datatypes/dt-param-card4-unsat.smt2 (100%) rename test/regress/{regress0 => regress1}/datatypes/error.cvc (100%) rename test/regress/{regress0 => regress1}/decision/quant-Arrays_Q1-noinfer.smt2 (100%) rename test/regress/{regress0 => regress1}/decision/quant-Arrays_Q1-noinfer.smt2.expect (100%) rename test/regress/{regress0 => regress1}/decision/quant-symmetric_unsat_7.smt2 (100%) rename test/regress/{regress0 => regress1}/decision/quant-symmetric_unsat_7.smt2.expect (100%) rename test/regress/{regress0 => regress1}/error.cvc (100%) rename test/regress/{regress0 => regress1}/errorcrash.smt2 (100%) rename test/regress/{regress0/push-pop => regress1}/fmf-fun-dbu.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/ALG008-1.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/LeftistHeap.scala-8-ncm.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/PUZ001+1.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/agree466.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/agree467.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/alg202+1.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/am-bad-model.cvc (100%) rename test/regress/{regress0 => regress1}/fmf/bound-int-alt.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/bug0909.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/bug651.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/bug723-irrelevant-funs.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/bug764.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/cons-sets-bounds.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/constr-ground-to.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/datatypes-ufinite-nested.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/datatypes-ufinite.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/dt-proper-model.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fc-pigeonhole19.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fib-core.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fmf-bound-2dim.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fmf-bound-int.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fmf-fun-no-elim-ext-arith.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fmf-fun-no-elim-ext-arith2.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/fmf-strange-bounds.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/forall_unit_data.smt2 (82%) rename test/regress/{regress0 => regress1}/fmf/fore19-exp2-core.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/german169.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/german73.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/issue916-fmf-or.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/jasmin-cdt-crash.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/ko-bound-set.cvc (100%) rename test/regress/{regress0 => regress1}/fmf/loopy_coda.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/lst-no-self-rev-exp.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/memory_model-R_cpp-dd.cvc (100%) rename test/regress/{regress0 => regress1}/fmf/nun-0208-to.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/pow2-bool.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/refcount24.cvc.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/sc-crash-052316.smt2 (100%) rename test/regress/{regress0 => regress1}/fmf/with-ind-104-core.smt2 (100%) rename test/regress/{regress0/uf => regress1}/gensys_brn001.smt2 (100%) create mode 100644 test/regress/regress1/ho/Makefile.am rename test/regress/{regress0 => regress1}/ho/auth0068.smt2 (100%) rename test/regress/{regress0 => regress1}/ho/fta0409.smt2 (100%) rename test/regress/{regress0 => regress1}/ho/ho-exponential-model.smt2 (100%) rename test/regress/{regress0 => regress1}/ho/ho-matching-enum-2.smt2 (100%) rename test/regress/{regress0 => regress1}/ho/ho-std-fmf.smt2 (100%) rename test/regress/{regress0 => regress1}/ho/hoa0102.smt2 (100%) rename test/regress/{regress0 => regress1}/hole6.cvc (100%) rename test/regress/{regress0 => regress1}/issue1048-arrays-int-real.smt2 (100%) rename test/regress/{regress0 => regress1}/ite5.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/NAVIGATION2.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/arrowsmith-050317.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/bad-050217.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/bug698.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/coeff-unsat-base.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/coeff-unsat.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/combine.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/cos-bound.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/cos1-tc.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/disj-eval.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/dist-big.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/div-mod-partial.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/exp-4.5-lt.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/exp1-lb.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/exp_monotone.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/metitarski-1025.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/metitarski-3-4.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/metitarski_3_4_2e.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/nl-help-unsat-quant.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/nl-unk-quant.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/ones.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/poly-1025.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/quant-nl.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/red-exp.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/rewriting-sums.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/shifting.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/shifting2.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/simple-mono-unsat.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/simple-mono.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin-compare-across-phase.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin-compare.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin-init-tangents.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin-sign.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin-sym2.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin1-lb.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin1-sat.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin1-ub.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin2-lb.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sin2-ub.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/sqrt-problem-1.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sugar-ident-2.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sugar-ident-3.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/sugar-ident.smt2 (100%) rename test/regress/{regress0/nl/nta => regress1/nl}/tan-rewrite2.smt2 (100%) rename test/regress/{regress0 => regress1}/nl/zero-subset.smt2 (100%) rename test/regress/{regress0 => regress1}/non-fatal-errors.smt2 (100%) rename test/regress/{regress0/arrays => regress1}/parsing_ringer.cvc (100%) rename test/regress/{regress0/uf => regress1}/proof00.smt2 (100%) create mode 100644 test/regress/regress1/push-pop/Makefile.am rename test/regress/{regress0 => regress1}/push-pop/arith_lra_01.smt2 (100%) rename test/regress/{regress0 => regress1}/push-pop/arith_lra_02.smt2 (100%) rename test/regress/{regress0 => regress1}/push-pop/bug-fmf-fun-skolem.smt2 (100%) rename test/regress/{regress0 => regress1}/push-pop/bug216.smt2 (100%) rename test/regress/{regress0 => regress1}/push-pop/bug216.smt2.expect (100%) rename test/regress/{regress0 => regress1}/push-pop/bug326.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_1.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_10.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_11.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_15.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_16.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_19.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_1_to_52_merged.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_20.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_23.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_24.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_25.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_26.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_28.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_29.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_30.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_32.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_34.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_35.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_37.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_39.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_1.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_10.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_11.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_12.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_13.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_14.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_15.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_2.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_3.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_4.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_5.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_6.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_7.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_8.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_3_9.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_4.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_40.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_41.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_42.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_43.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_44.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_45.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_5.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_51.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_52.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_5_1.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_5_2.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_5_3.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_5_4.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_5_5.smt2 (100%) rename test/regress/{regress0/push-pop/arith => regress1/push-pop}/fuzz_5_6.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_6.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_7.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_8.smt2 (100%) rename test/regress/{regress0/push-pop/boolean => regress1/push-pop}/fuzz_9.smt2 (100%) rename test/regress/{regress0 => regress1}/push-pop/quant-fun-proc-unmacro.smt2 (100%) rename test/regress/{regress0 => regress1}/push-pop/quant-fun-proc.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/006-cbqi-ite.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/AdditiveMethods_OwnedResults.Mz.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/Arrays_Q1-noinfer.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/NUM878.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/RND-small.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/RNDPRE_4_1-dd-nqe.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/RND_4_16.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/anti-sk-simp.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/ari118-bv-2occ-x.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/array-unsat-simp3.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/bi-artm-s.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/bignum_quant.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/bug822.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/bug_743.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/burns13.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/burns4.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/cdt-0208-to.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/ext-ex-deq-trigger.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/extract-nproc.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/florian-case-ax.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/gauss_init_0030.fof.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/inst-max-level-segf.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/intersection-example-onelane.proof-node22337.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/is-even.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/javafe.ast.StmtVec.009.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/macro-subtype-param.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/mix-coeff.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/model_6_1_bv.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/nested9_true-unreach-call.i_575.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/opisavailable-12.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/parametric-lists.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/psyco-001-bv.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/psyco-107-bv.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/psyco-196.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-disequality3.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-simple-2vars-vo.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvashr-0.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvashr-1.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvcomp.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvlshr-1.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvmul-neq.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvmul.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvudiv-0-neq.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvudiv-0.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvudiv-1-neq.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvudiv-1.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvurem-1-neq.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-invert-bvurem-1.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qbv-test-urem-rewrite.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qcft-javafe.filespace.TreeWalker.006.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/qcft-smtlib3dbc51.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/quaternion_ds1_symm_0428.fof.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/rew-to-0211-dd.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/ricart-agrawala6.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/set3.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/set8.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/small-pipeline-fixpoint-3.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/smtlib384a03.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/smtlib46f14a.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/smtlibf957ea.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/stream-x2014-09-18-unsat.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/subtype-param-unk.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/subtype-param.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/symmetric_unsat_7.smt2 (100%) rename test/regress/{regress0 => regress1}/quantifiers/z3.620661-no-fv-trigger.smt2 (100%) create mode 100644 test/regress/regress1/rels/Makefile.am rename test/regress/{regress0 => regress1}/rels/addr_book_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/addr_book_1_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/bv1-unit.cvc (100%) rename test/regress/{regress0 => regress1}/rels/bv1-unitb.cvc (100%) rename test/regress/{regress0 => regress1}/rels/bv1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/bv1p-sat.cvc (100%) rename test/regress/{regress0 => regress1}/rels/bv1p.cvc (100%) rename test/regress/{regress0 => regress1}/rels/bv2.cvc (100%) rename test/regress/{regress0 => regress1}/rels/garbage_collect.cvc (100%) rename test/regress/{regress0 => regress1}/rels/iden_1_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/join-eq-structure-and.cvc (100%) rename test/regress/{regress0 => regress1}/rels/join-eq-structure.cvc (100%) rename test/regress/{regress0 => regress1}/rels/join-eq-structure_0_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/joinImg_0_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/joinImg_0_2.cvc (100%) rename test/regress/{regress0 => regress1}/rels/joinImg_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/joinImg_1_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/joinImg_2.cvc (100%) rename test/regress/{regress0 => regress1}/rels/joinImg_2_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/prod-mod-eq.cvc (100%) rename test/regress/{regress0 => regress1}/rels/prod-mod-eq2.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_complex_3.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_complex_4.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_complex_5.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_mix_0_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_pressure_0.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tc_10_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tc_4.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tc_4_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tc_5_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tc_6.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tc_9_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tp_2.cvc (100%) rename test/regress/{regress0 => regress1}/rels/rel_tp_join_2_1.cvc (100%) rename test/regress/{regress0 => regress1}/rels/set-strat.cvc (100%) rename test/regress/{regress0 => regress1}/rels/strat.cvc (100%) rename test/regress/{regress0 => regress1}/rels/strat_0_1.cvc (100%) rename test/regress/{regress0 => regress1}/rewriterules/datatypes2.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/datatypes3.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/datatypes_clark_quantification.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/datatypes_sat.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_010.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_010_lemma.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_020.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_020_sat.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_040.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_040_lemma.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_040_lemma_trigger.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_080.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_160_lemma.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_gen_inv_160.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_trick3.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/length_trick3_int.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/set_A_new_fast_tableau-base.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/set_A_new_fast_tableau-base_sat.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/test_guards.smt2 (100%) rename test/regress/{regress0 => regress1}/rewriterules/why3_vstte10_max_sum_harness2.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/chain-int.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/crash1220.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/dispose-list-4-init.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/emp2-quant-unsat.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/finite-witness-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/fmf-nemp-2.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/pto-04.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/quant_wand.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-02.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-03.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-find2.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-fmf-priority.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-neg-1refine.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-neg-nstrict.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-neg-nstrict2.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-neg-simple.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-neg-swap.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-nterm-again.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/sep-nterm-val-model.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/simple-neg-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-0526-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-false.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-nterm-simp.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-nterm-simp2.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-simp-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-simp-sat2.smt2 (100%) rename test/regress/{regress0 => regress1}/sep/wand-simp-unsat.smt2 (100%) rename test/regress/{regress0/sets/jan27 => regress1/sets}/ListElem.hs.fqout.cvc4.38.smt2 (100%) rename test/regress/{regress0/sets/feb3 => regress1/sets}/ListElts.hs.fqout.cvc4.317.smt2 (100%) rename test/regress/{regress0/sets/jan28 => regress1/sets}/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 (100%) rename test/regress/{regress0/sets/mar2014 => regress1/sets}/UniqueZipper.hs.1030minimized.cvc4.smt2 (100%) rename test/regress/{regress0/sets/mar2014 => regress1/sets}/UniqueZipper.hs.1030minimized2.cvc4.smt2 (100%) rename test/regress/{regress0/sets/jan30 => regress1/sets}/UniqueZipper.hs.fqout.cvc4.10.smt2 (100%) rename test/regress/{regress0/sets/jan30 => regress1/sets}/UniqueZipper.hs.fqout.cvc4.1832.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/arjun-set-univ.cvc (100%) rename test/regress/{regress0 => regress1}/sets/card-3.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/card-4.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/card-5.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/card-6.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/card-7.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/copy_check_heap_access_33_4.smt2 (100%) rename test/regress/{regress0/sets/jan27 => regress1/sets}/deepmeas0.hs.fqout.cvc4.41.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/fuzz14418.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/fuzz15201.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/fuzz31811.smt2 (100%) rename test/regress/{regress0/sets/jan24 => regress1/sets}/insert_invariant_37_2.smt2 (100%) rename test/regress/{regress0/sets/mar2014 => regress1/sets}/lemmabug-ListElts317minimized.smt2 (100%) rename test/regress/{regress0/sets/jan24 => regress1/sets}/remove_check_free_31_6.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/setofsets-disequal.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/sets-tuple-poly.cvc (100%) rename test/regress/{regress0 => regress1}/sets/sharingbug.smt2 (100%) rename test/regress/{regress0 => regress1}/sets/univ-set-uf-elim.smt2 (100%) rename test/regress/{regress0 => regress1}/simple-rdl-definefun.smt2 (100%) rename test/regress/{regress0 => regress1}/simplification_bug4.smt2 (100%) rename test/regress/{regress0 => regress1}/simplification_bug4.smt2.expect (100%) rename test/regress/{regress0 => regress1}/sqrt2-sort-inf-unk.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/artemis-0512-nonterm.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/at001.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/bug615.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/bug682.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/bug686dd.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/bug768.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/bug799-min.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/chapman150408.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/cmu-2db2-extf-reg.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/cmu-disagree-0707-dd.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/cmu-inc-nlpp-071516.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/cmu-substr-rw.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/crash-1019.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/csp-prefix-exp-bug.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/fmf001.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/fmf002.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/gm-inc-071516-2.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/idof-handg.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/idof-nconst-index.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/idof-neg-index.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/idof-triv.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/ilc-l-nt.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/issue1105.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/kaluza-fl.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop002.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop003.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop004.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop005.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop006.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop007.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop008.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/loop009.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/nf-ff-contains-abs.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/norn-360.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/norn-ab.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/norn-nel-bug-052116.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/norn-simp-rew-sat.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/pierre150331.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/regexp001.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/regexp002.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/regexp003.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/reloop.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/repl-empty-sem.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/repl-soundness-sem.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/str001.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/str002.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/str006.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/str007.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/strings-index-empty.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/strip-endpt-sound.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/substr001.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/type002.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/type003.smt2 (100%) rename test/regress/{regress0 => regress1}/strings/username_checker_min.smt2 (100%) rename test/regress/{regress0 => regress1}/sygus/Base16_1.sy (100%) rename test/regress/{regress0 => regress1}/sygus/array_search_2.sy (100%) rename test/regress/{regress0 => regress1}/sygus/array_sum_2_5.sy (100%) rename test/regress/{regress0 => regress1}/sygus/cegar1.sy (100%) rename test/regress/{regress0 => regress1}/sygus/cggmp.sy (100%) rename test/regress/{regress0 => regress1}/sygus/clock-inc-tuple.sy (100%) rename test/regress/{regress0 => regress1}/sygus/commutative.sy (100%) rename test/regress/{regress0 => regress1}/sygus/constant.sy (100%) rename test/regress/{regress0 => regress1}/sygus/dt-test-ns.sy (100%) rename test/regress/{regress0 => regress1}/sygus/dup-op.sy (100%) rename test/regress/{regress0 => regress1}/sygus/enum-test.sy (100%) rename test/regress/{regress0 => regress1}/sygus/fg_polynomial3.sy (100%) rename test/regress/{regress0 => regress1}/sygus/hd-01-d1-prog.sy (100%) rename test/regress/{regress0 => regress1}/sygus/hd-19-d1-prog-dup-op.sy (100%) rename test/regress/{regress0 => regress1}/sygus/icfp_14.12-flip-args.sy (100%) rename test/regress/{regress0 => regress1}/sygus/icfp_14.12.sy (100%) rename test/regress/{regress0 => regress1}/sygus/icfp_28_10.sy (100%) rename test/regress/{regress0 => regress1}/sygus/icfp_easy-ite.sy (100%) rename test/regress/{regress0 => regress1}/sygus/inv-example.sy (100%) rename test/regress/{regress0 => regress1}/sygus/inv-unused.sy (100%) rename test/regress/{regress0 => regress1}/sygus/list-head-x.sy (100%) rename test/regress/{regress0 => regress1}/sygus/max.sy (100%) rename test/regress/{regress0 => regress1}/sygus/multi-fun-polynomial2.sy (100%) rename test/regress/{regress0 => regress1}/sygus/nflat-fwd-3.sy (100%) rename test/regress/{regress0 => regress1}/sygus/nflat-fwd.sy (100%) rename test/regress/{regress0 => regress1}/sygus/nia-max-square-ns.sy (100%) rename test/regress/{regress0 => regress1}/sygus/no-flat-simp.sy (100%) rename test/regress/{regress0 => regress1}/sygus/no-mention.sy (100%) rename test/regress/{regress0 => regress1}/sygus/process-10-vars.sy (100%) rename test/regress/{regress0 => regress1}/sygus/qe.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-concat-3-args.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-double-rec.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-small.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-template-infer-unused.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-template-infer.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-trivial-simp.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-trivial-two-type.sy (100%) rename test/regress/{regress0 => regress1}/sygus/strings-trivial.sy (100%) rename test/regress/{regress0 => regress1}/sygus/sygus-dt.sy (100%) rename test/regress/{regress0 => regress1}/sygus/tl-type-0.sy (100%) rename test/regress/{regress0 => regress1}/sygus/tl-type-4x.sy (100%) rename test/regress/{regress0 => regress1}/sygus/tl-type.sy (100%) rename test/regress/{regress0 => regress1}/sygus/triv-type-mismatch-si.sy (100%) rename test/regress/{regress0 => regress1}/sygus/twolets1.sy (100%) rename test/regress/{regress0 => regress1}/sygus/twolets2-orig.sy (100%) rename test/regress/{regress0 => regress1}/sygus/unbdd_inv_gen_winf1.sy (100%) rename test/regress/{regress0 => regress1}/test12.cvc (100%) rename test/regress/{regress0 => regress1}/trim.cvc (100%) rename test/regress/{regress0/unconstrained => regress1}/uf2.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/DRAGON_11_e1_2450.ec.minimized.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect (100%) rename test/regress/{regress0 => regress1}/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect (100%) rename test/regress/{regress0 => regress1}/uflia/FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 (100%) create mode 100644 test/regress/regress1/uflia/Makefile.am rename test/regress/{regress0 => regress1}/uflia/microwave21.ec.minimized.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/simple_cyclic2.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/speed2_e8_449_e8_517.ec.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/speed2_e8_449_e8_517.ec.smt2.expect (100%) rename test/regress/{regress0 => regress1}/uflia/stalmark_e7_27_e7_31.ec.smt2 (100%) rename test/regress/{regress0 => regress1}/uflia/stalmark_e7_27_e7_31.ec.smt2.expect (100%) rename test/regress/{regress0/arith/integers => regress2/arith}/arith-int-098.cvc (100%) rename test/regress/{regress0 => regress2}/arith/miplib-opt1217--27.smt2 (100%) rename test/regress/{regress0 => regress2}/arith/miplib-pp08a-3000.smt2 (100%) rename test/regress/{regress0/push-pop => regress2}/bug396.smt2 (100%) rename test/regress/{regress0/push-pop => regress2}/bug674.smt2 (100%) rename test/regress/{regress0/push-pop => regress2}/bug765.smt2 (100%) rename test/regress/{regress0/uflia => regress2}/javafe.ast.StandardPrettyPrint.319_no_forall.smt2 (100%) rename test/regress/{regress0/uflia => regress2}/javafe.ast.WhileStmt.447_no_forall.smt2 (100%) create mode 100644 test/regress/regress2/nl/Makefile.am rename test/regress/{regress0/nl/nta => regress2/nl}/dumortier-050317.smt2 (100%) rename test/regress/{regress0 => regress2}/nl/nt-lemmas-bad.smt2 (100%) rename test/regress/{regress1 => regress2}/nl/siegel-nl-bases.smt2 (100%) rename test/regress/{regress0 => regress2}/quantifiers/AdditiveMethods_AdditiveMethods..ctor.smt2 (100%) rename test/regress/{regress1/fmf => regress2/quantifiers}/ForElimination-scala-9.smt2 (100%) create mode 100644 test/regress/regress2/quantifiers/Makefile.am rename test/regress/{regress0 => regress2}/quantifiers/javafe.ast.ArrayInit.35.smt2 (100%) rename test/regress/{regress0 => regress2}/quantifiers/javafe.ast.StandardPrettyPrint.319.smt2 (100%) rename test/regress/{regress0 => regress2}/quantifiers/javafe.ast.WhileStmt.447.smt2 (100%) rename test/regress/{regress0 => regress2}/quantifiers/javafe.tc.CheckCompilationUnit.001.smt2 (100%) rename test/regress/{regress0 => regress2}/quantifiers/javafe.tc.FlowInsensitiveChecks.682.smt2 (100%) rename test/regress/{regress1/fmf => regress2/quantifiers}/nunchaku2309663.nun.min.smt2 (100%) rename test/regress/{regress0 => regress2}/quantifiers/small-bug1-fixpoint-3.smt2 (100%) rename test/regress/{regress0/uflia => regress2}/simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 (100%) create mode 100644 test/regress/regress2/strings/Makefile.am rename test/regress/{regress1 => regress2}/strings/cmu-dis-0707-3.smt2 (100%) rename test/regress/{regress1 => regress2}/strings/cmu-prereg-fmf.smt2 (100%) rename test/regress/{regress1 => regress2}/strings/cmu-repl-len-nterm.smt2 (100%) rename test/regress/{regress0 => regress2}/strings/norn-dis-0707-3.smt2 (100%) rename test/regress/{regress1 => regress2}/sygus/MPwL_d1s3.sy (100%) create mode 100644 test/regress/regress2/sygus/Makefile.am rename test/regress/{regress1 => regress2}/sygus/array_sum_dd.sy (100%) rename test/regress/{regress1 => regress2}/sygus/icfp_easy_mt_ite.sy (100%) rename test/regress/{regress1 => regress2}/sygus/inv_gen_n_c11.sy (100%) rename test/regress/{regress1 => regress2}/sygus/lustre-real.sy (100%) rename test/regress/{regress0 => regress2}/sygus/max2-univ.sy (100%) rename test/regress/{regress1 => regress2}/sygus/mpg_guard1-dd.sy (100%) rename test/regress/{regress1 => regress2}/sygus/nia-max-square.sy (100%) rename test/regress/{regress0 => regress2}/sygus/no-syntax-test-no-si.sy (100%) rename test/regress/{regress0 => regress2}/sygus/process-10-vars-2fun.sy (100%) rename test/regress/{regress1 => regress2}/sygus/process-arg-invariance.sy (100%) rename test/regress/{regress0 => regress2}/sygus/real-grammar-neg.sy (100%) rename test/regress/{regress1 => regress2}/sygus/three.sy (100%) diff --git a/test/Makefile.am b/test/Makefile.am index f6cc1e2df..65dd601b1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -48,7 +48,6 @@ subdirs_to_check = \ regress/regress0/precedence \ regress/regress0/preprocess \ regress/regress0/push-pop \ - regress/regress0/push-pop/arith \ regress/regress0/push-pop/boolean \ regress/regress0/quantifiers \ regress/regress0/rels \ @@ -69,15 +68,24 @@ subdirs_to_check = \ regress/regress1/datatypes \ regress/regress1/decision \ regress/regress1/fmf \ + regress/regress1/ho \ regress/regress1/lemmas \ + regress/regress1/nl \ + regress/regress1/push-pop \ + regress/regress1/rels \ regress/regress1/rewriterules \ regress/regress1/sep \ regress/regress1/sets \ regress/regress1/strings \ regress/regress1/sygus \ regress/regress1/quantifiers \ + regress/regress1/uflia \ regress/regress2 \ regress/regress2/arith \ + regress/regress2/nl \ + regress/regress2/quantifiers \ + regress/regress2/strings \ + regress/regress2/sygus \ regress/regress3 \ regress/regress4 \ system \ diff --git a/test/regress/regress0/Makefile.am b/test/regress/regress0/Makefile.am index 80ca1a5ef..7127c5739 100644 --- a/test/regress/regress0/Makefile.am +++ b/test/regress/regress0/Makefile.am @@ -48,17 +48,14 @@ SMT_TESTS = \ SMT2_TESTS = \ arrayinuf_declare.smt2 \ boolean-terms-kernel1.smt2 \ - boolean-terms-kernel2.smt2 \ boolean-terms-bug-array.smt2 \ chained-equality.smt2 \ ite2.smt2 \ ite3.smt2 \ ite4.smt2 \ - ite5.smt2 \ simple-lra.smt2 \ simple-rdl.smt2 \ simple-uf.smt2 \ - simplification_bug4.smt2 \ parallel-let.smt2 \ get-value-incremental.smt2 \ get-value-reals.smt2 \ @@ -73,17 +70,13 @@ SMT2_TESTS = \ issue1063-overloading-dt-cons.smt2 \ issue1063-overloading-dt-sel.smt2 \ issue1063-overloading-dt-fun.smt2 \ - non-fatal-errors.smt2 \ reset-assertions.smt2 \ - sqrt2-sort-inf-unk.smt2 \ rec-fun-const-parse-bug.smt2 # Regression tests for PL inputs CVC_TESTS = \ - boolean.cvc \ boolean-prec.cvc \ boolean-terms.cvc \ - hole6.cvc \ ite.cvc \ let.cvc \ logops.01.cvc \ @@ -118,7 +111,6 @@ CVC_TESTS = \ wiki.20.cvc \ wiki.21.cvc \ queries0.cvc \ - trim.cvc \ print_lambda.cvc \ cvc3.userdoc.01.cvc \ cvc3.userdoc.02.cvc \ @@ -140,7 +132,6 @@ BUG_TESTS = \ bug167.smt \ bug168.smt \ bug187.smt2 \ - bug216.smt2 \ bug217.smt2 \ bug220.smt2 \ bug239.smt \ @@ -148,7 +139,6 @@ BUG_TESTS = \ bug288.smt \ bug288b.smt \ bug288c.smt \ - bug296.smt2 \ buggy-ite.smt2 \ bug303.smt2 \ bug310.cvc \ @@ -164,23 +154,17 @@ BUG_TESTS = \ bug480.smt2 \ bug484.smt2 \ bug486.cvc \ - bug507.smt2 \ bug512.minimized.smt2 \ - bug516.smt2 \ - bug520.smt2 \ bug521.minimized.smt2 \ bug522.smt2 \ bug528a.smt2 \ bug541.smt2 \ - bug543.smt2 \ bug544.smt2 \ bug548a.smt2 \ - bug567.smt2 \ bug576.smt2 \ bug576a.smt2 \ bug578.smt2 \ bug586.cvc \ - bug593.smt2 \ bug595.cvc \ bug596.cvc \ bug596b.cvc \ @@ -189,7 +173,6 @@ BUG_TESTS = \ bt-test-00.smt2 \ bt-test-01.smt2 \ bug1247.smt2 -#bug590.smt2 TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(TPTP_TESTS) $(BUG_TESTS) @@ -197,31 +180,12 @@ TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(TPTP_TESTS) $(BUG_TESTS) # we have a minimized version still getting tested # bug639 -- still fails, reopened bug # bug585 -- contains subrange type (not supported) -# issue1048-arrays-int-real.smt2 -- different errors on debug and production -DISABLED_TESTS = \ - bug512.smt2 \ - bug585.cvc - -EXTRA_DIST = $(TESTS) \ - simplification_bug4.smt2.expect \ - bug216.smt2.expect \ - bug590.smt2.expect - -if CVC4_BUILD_PROFILE_COMPETITION -else -TESTS += \ - bug681.smt2 \ - error.cvc \ - errorcrash.smt2 \ - arrayinuf_error.smt2 -endif + + +EXTRA_DIST = $(TESTS) # and make sure to distribute it -EXTRA_DIST += $(DISABLED_TESTS) \ - subranges.cvc \ - arrayinuf_error.smt2 \ - errorcrash.smt2 \ - error.cvc +EXTRA_DIST += $(DISABLED_TESTS) # synonyms for "check" in this directory .PHONY: regress regress0 test diff --git a/test/regress/regress0/arith/Makefile.am b/test/regress/regress0/arith/Makefile.am index 98179df8c..8a12d7d13 100644 --- a/test/regress/regress0/arith/Makefile.am +++ b/test/regress/regress0/arith/Makefile.am @@ -28,38 +28,24 @@ TESTS = \ fuzz_3-eq.smt \ leq.01.smt \ mod.01.smt2 \ - mod.02.smt2 \ - mod.03.smt2 \ div.01.smt2 \ div.02.smt2 \ - div.03.smt2 \ div.04.smt2 \ div.05.smt2 \ - div.06.smt2 \ div.07.smt2 \ - div.08.smt2 \ mult.01.smt2 \ - mult.02.smt2 \ bug443.delta01.smt \ miplib.cvc \ miplib2.cvc \ - miplib3.cvc \ miplib4.cvc \ miplibtrick.smt \ - bug547.1.smt2 \ bug547.2.smt2 \ bug569.smt2 \ - div.09.smt2 \ - bug716.0.smt2 \ - bug716.1.cvc \ mod-simp.smt2 -# problem__003.smt2 EXTRA_DIST = $(TESTS) \ miplib-opt1217--27.smt \ - miplib-opt1217--27.smt2 \ miplib-pp08a-3000.smt \ - miplib-pp08a-3000.smt2 \ miplib-opt1217--27.smt.expect \ miplib-pp08a-3000.smt.expect diff --git a/test/regress/regress0/arith/integers/Makefile.am b/test/regress/regress0/arith/integers/Makefile.am index aa24e9c35..203598490 100644 --- a/test/regress/regress0/arith/integers/Makefile.am +++ b/test/regress/regress0/arith/integers/Makefile.am @@ -23,112 +23,16 @@ MAKEFLAGS = -k TESTS = \ - arith-int-004.cvc \ - arith-int-011.cvc \ - arith-int-012.cvc \ - arith-int-013.cvc \ - arith-int-022.cvc \ - arith-int-024.cvc \ arith-int-042.cvc \ - arith-int-042.min.cvc \ - arith-int-047.cvc \ - arith-int-048.cvc \ - arith-int-050.cvc \ - arith-int-084.cvc \ - arith-int-085.cvc \ - arith-int-097.cvc + arith-int-042.min.cvc EXTRA_DIST = $(TESTS) \ - arith-int-001.cvc \ - arith-int-002.cvc \ - arith-int-003.cvc \ - arith-int-005.cvc \ - arith-int-006.cvc \ - arith-int-008.cvc \ - arith-int-009.cvc \ - arith-int-010.cvc \ arith-int-014.cvc \ arith-int-015.cvc \ - arith-int-016.cvc \ - arith-int-017.cvc \ - arith-int-018.cvc \ - arith-int-019.cvc \ - arith-int-020.cvc \ arith-int-021.cvc \ arith-int-023.cvc \ arith-int-025.cvc \ - arith-int-026.cvc \ - arith-int-027.cvc \ - arith-int-028.cvc \ - arith-int-029.cvc \ - arith-int-030.cvc \ - arith-int-031.cvc \ - arith-int-032.cvc \ - arith-int-033.cvc \ - arith-int-034.cvc \ - arith-int-035.cvc \ - arith-int-036.cvc \ - arith-int-037.cvc \ - arith-int-038.cvc \ - arith-int-039.cvc \ - arith-int-040.cvc \ - arith-int-041.cvc \ - arith-int-043.cvc \ - arith-int-044.cvc \ - arith-int-045.cvc \ - arith-int-046.cvc \ - arith-int-049.cvc \ - arith-int-051.cvc \ - arith-int-052.cvc \ - arith-int-053.cvc \ - arith-int-054.cvc \ - arith-int-055.cvc \ - arith-int-056.cvc \ - arith-int-057.cvc \ - arith-int-058.cvc \ - arith-int-059.cvc \ - arith-int-060.cvc \ - arith-int-061.cvc \ - arith-int-062.cvc \ - arith-int-063.cvc \ - arith-int-064.cvc \ - arith-int-065.cvc \ - arith-int-066.cvc \ - arith-int-067.cvc \ - arith-int-068.cvc \ - arith-int-069.cvc \ - arith-int-070.cvc \ - arith-int-071.cvc \ - arith-int-072.cvc \ - arith-int-073.cvc \ - arith-int-074.cvc \ - arith-int-075.cvc \ - arith-int-076.cvc \ - arith-int-077.cvc \ - arith-int-078.cvc \ - arith-int-079.cvc \ - arith-int-080.cvc \ - arith-int-081.cvc \ - arith-int-083.cvc \ - arith-int-086.cvc \ - arith-int-087.cvc \ - arith-int-088.cvc \ - arith-int-089.cvc \ - arith-int-090.cvc \ - arith-int-091.cvc \ - arith-int-092.cvc \ - arith-int-093.cvc \ - arith-int-094.cvc \ - arith-int-095.cvc \ - arith-int-096.cvc \ - arith-int-098.cvc \ - arith-int-099.cvc \ - arith-int-100.cvc - -FAILING_TESTS = \ - arith-int-007.cvc \ - arith-int-082.cvc \ - arith-int-098.cvc + arith-int-079.cvc #if CVC4_BUILD_PROFILE_COMPETITION #else diff --git a/test/regress/regress0/arrays/Makefile.am b/test/regress/regress0/arrays/Makefile.am index 17cfa3fd4..bdc7352f5 100644 --- a/test/regress/regress0/arrays/Makefile.am +++ b/test/regress/regress0/arrays/Makefile.am @@ -44,11 +44,8 @@ TESTS = \ bug272.minimized.smt \ constarr.smt2 \ constarr2.smt2 \ - constarr3.smt2 \ constarr.cvc \ constarr2.cvc \ - constarr3.cvc \ - parsing_ringer.cvc \ bug637.delta.smt2 \ bool-array.smt2 diff --git a/test/regress/regress0/aufbv/Makefile.am b/test/regress/regress0/aufbv/Makefile.am index e23368e3a..8fda89ad7 100644 --- a/test/regress/regress0/aufbv/Makefile.am +++ b/test/regress/regress0/aufbv/Makefile.am @@ -24,7 +24,6 @@ TESTS = \ bug347.smt \ bug451.smt \ bug509.smt \ - bug580.smt2 \ bug580.delta.smt2 \ try5_small_difret_functions_wp_su.set_char_quoting.il.wp.delta01.smt \ try3_sameret_functions_fse-bfs_tac.calc_next.il.fse-bfs.delta01.smt \ diff --git a/test/regress/regress0/bv/Makefile.am b/test/regress/regress0/bv/Makefile.am index 912f6871d..44691d1e2 100644 --- a/test/regress/regress0/bv/Makefile.am +++ b/test/regress/regress0/bv/Makefile.am @@ -92,28 +92,17 @@ SMT_TESTS = \ fuzz41.smt \ calc2_sec2_shifter_mult_bmc15.atlas.delta01.smt \ smtcompbug.smt \ - unsound1.smt2 \ unsound1-reduced.smt2 \ - bv2nat-ground.smt2 \ bv2nat-ground-c.smt2 \ - cmu-rdk-3.smt2 \ bv2nat-simp-range.smt2 \ - bv2nat-simp-range-sat.smt2 \ bv-int-collapse1.smt2 \ bv-int-collapse2.smt2 \ - bv-int-collapse2-sat.smt2 \ divtest_2_5.smt2 \ divtest_2_6.smt2 \ mul-neg-unsat.smt2 \ mul-negpow2.smt2 \ bvmul-pow2-only.smt2 -# This benchmark is currently disabled as it uses --check-proof -# bench_38.delta.smt2 - -# Regression tests for SMT2 inputs -SMT2_TESTS = divtest.smt2 - # Regression tests for PL inputs CVC_TESTS = bvsimple.cvc sizecheck.cvc @@ -123,11 +112,9 @@ BUG_TESTS = \ bug260b.smt \ bug440.smt \ bug733.smt2 \ - bug734.smt2 \ - bug_extract_mult_leading_bit.smt2 \ - bug787.smt2 + bug734.smt2 -TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(BUG_TESTS) +TESTS = $(SMT_TESTS) $(CVC_TESTS) $(BUG_TESTS) EXTRA_DIST = $(TESTS) \ test00.smt \ diff --git a/test/regress/regress0/datatypes/Makefile.am b/test/regress/regress0/datatypes/Makefile.am index a71c15869..7200b813d 100644 --- a/test/regress/regress0/datatypes/Makefile.am +++ b/test/regress/regress0/datatypes/Makefile.am @@ -70,7 +70,6 @@ TESTS = \ conqueue-dt-enum-iloop.smt2 \ coda_simp_model.smt2 \ Test1-tup-mp.cvc \ - dt-param-card4-unsat.smt2 \ dt-param-card4-bool-sat.smt2 \ bug604.smt2 \ bug597-rbt.smt2 \ @@ -78,11 +77,9 @@ TESTS = \ dt-2.6.smt2 \ dt-sel-2.6.smt2 \ dt-param-2.6.smt2 \ - dt-color-2.6.smt2 \ dt-match-pat-param-2.6.smt2 \ tuple-no-clash.cvc \ jsat-2.6.smt2 \ - acyclicity-sr-ground096.smt2 \ model-subterms-min.smt2 \ issue1433.smt2 \ tuples-empty.smt2 \ @@ -90,20 +87,12 @@ TESTS = \ # rec5 -- no longer support subrange types FAILING_TESTS = \ - datatype-dump.cvc \ - rec5.cvc + datatype-dump.cvc EXTRA_DIST = $(TESTS) -if CVC4_BUILD_PROFILE_COMPETITION -else -TESTS += \ - error.cvc -endif - # and make sure to distribute it EXTRA_DIST += \ - error.cvc \ $(FAILING_TESTS) # synonyms for "check" diff --git a/test/regress/regress0/datatypes/bug341.cvc b/test/regress/regress0/datatypes/bug341.cvc deleted file mode 100644 index 69969a36f..000000000 --- a/test/regress/regress0/datatypes/bug341.cvc +++ /dev/null @@ -1,5 +0,0 @@ -% EXPECT: invalid - -f : [0..2] -> INT; - -QUERY( f(0) = 0 ); diff --git a/test/regress/regress0/datatypes/rec5.cvc b/test/regress/regress0/datatypes/rec5.cvc deleted file mode 100644 index b4da49d78..000000000 --- a/test/regress/regress0/datatypes/rec5.cvc +++ /dev/null @@ -1,204 +0,0 @@ -% EXPECT: invalid -bit__ty: TYPE = [0..1]; -bc1553__lru_name: TYPE = [0..11]; -bus__inputs__type: TYPE; -bus__word_index: TYPE = INT; -cartesian__position: TYPE = [# x: INT, y: INT, z: INT #]; -ibit__phase: TYPE = [0..6]; -measuretypes__meter: TYPE = INT; -bc1553__asi: [0..11]; -bc1553__barometer: [0..11]; -bc1553__compass: [0..11]; -bc1553__destruct: [0..11]; -bc1553__fins: [0..11]; -bc1553__fuel: [0..11]; -bc1553__fuze: [0..11]; -bc1553__infrared: [0..11]; -bc1553__ins: [0..11]; -bc1553__lru_name__base__first: [0..11]; -bc1553__lru_name__base__last: [0..11]; -bc1553__lru_name__first: [0..11]; -bc1553__lru_name__last: [0..11]; -bc1553__lru_name__size: INT; -bc1553__motor: [0..11]; -bc1553__radar: [0..11]; -bc1553__warhead: [0..11]; -bus__all_msg_index__base__first: INT; -bus__all_msg_index__base__last: INT; -bus__all_msg_index__first: INT; -bus__all_msg_index__last: INT; -bus__all_msg_index__size: INT; -bus__lru_subaddress_index__base__first: INT; -bus__lru_subaddress_index__base__last: INT; -bus__lru_subaddress_index__first: INT; -bus__lru_subaddress_index__last: INT; -bus__lru_subaddress_index__size: INT; -bus__word__base__first: INT; -bus__word__base__last: INT; -bus__word__first: INT; -bus__word__last: INT; -bus__word__size: INT; -bus__word_index__base__first: INT; -bus__word_index__base__last: INT; -bus__word_index__first: INT; -bus__word_index__last: INT; -bus__word_index__size: INT; -bus_id: [0..11]; -ibit__fail: [0..6]; -ibit__in_progress: [0..6]; -ibit__off: [0..6]; -ibit__pass: [0..6]; -ibit__phase__base__first: [0..6]; -ibit__phase__base__last: [0..6]; -ibit__phase__first: [0..6]; -ibit__phase__last: [0..6]; -ibit__phase__size: INT; -ibit__request_start: [0..6]; -ibit__request_stop: [0..6]; -ibit__timeout: [0..6]; -integer__base__first: INT; -integer__base__last: INT; -integer__first: INT; -integer__last: INT; -integer__size: INT; -measuretypes__meter__base__first: INT; -measuretypes__meter__base__last: INT; -measuretypes__meter__first: INT; -measuretypes__meter__last: INT; -measuretypes__meter__size: INT; -systemtypes__unsigned16__base__first: INT; -systemtypes__unsigned16__base__last: INT; -systemtypes__unsigned16__first: INT; -systemtypes__unsigned16__last: INT; -systemtypes__unsigned16__size: INT; -bus__inputs: bus__inputs__type; -bus__inputs__tilde: bus__inputs__type; -ibit_request: [0..6]; -ibit_request__5: [0..6]; -ibit_request__5__tilde: [0..6]; -ibit_request__tilde: [0..6]; -last_position: [# x: INT, y: INT, z: INT #]; -last_position__1: [# x: INT, y: INT, z: INT #]; -last_position__1__tilde: [# x: INT, y: INT, z: INT #]; -last_position__2: [# x: INT, y: INT, z: INT #]; -last_position__2__tilde: [# x: INT, y: INT, z: INT #]; -last_position__3: [# x: INT, y: INT, z: INT #]; -last_position__3__tilde: [# x: INT, y: INT, z: INT #]; -last_position__tilde: [# x: INT, y: INT, z: INT #]; -word: INT; -word__4: INT; -word__4__tilde: INT; -word__tilde: INT; -bc1553__is_fresh: ([0..11], INT, bus__inputs__type) -> BOOLEAN; -bc1553__is_valid: ([0..11], INT, bus__inputs__type) -> BOOLEAN; -bc1553__lru_name__LE: ([0..11], [0..11]) -> BOOLEAN; -bc1553__lru_name__pos: [0..11] -> INT; -bc1553__lru_name__pred: [0..11] -> [0..11]; -bc1553__lru_name__succ: [0..11] -> [0..11]; -bc1553__lru_name__val: INT -> [0..11]; -character__pos: INT -> INT; -character__val: INT -> INT; -ibit__phase__LE: ([0..6], [0..6]) -> BOOLEAN; -ibit__phase__pos: [0..6] -> INT; -ibit__phase__pred: [0..6] -> [0..6]; -ibit__phase__succ: [0..6] -> [0..6]; -ibit__phase__val: INT -> [0..6]; -integer__pred: INT -> INT; -integer__succ: INT -> INT; -round__: REAL -> INT; -int__div: (INT, INT) -> INT; -int__mod: (INT, INT) -> INT; -ASSERT (bus_id = bc1553__ins); -ASSERT (0 <= integer__size); -ASSERT (integer__first = -(2147483647)); -ASSERT (integer__last = 2147483647); -ASSERT (integer__base__first = -(2147483647)); -ASSERT (integer__base__last = 2147483647); -ASSERT (0 <= systemtypes__unsigned16__size); -ASSERT (systemtypes__unsigned16__first = 0); -ASSERT (systemtypes__unsigned16__last = 65535); -ASSERT (systemtypes__unsigned16__base__first = -(2147483647)); -ASSERT (systemtypes__unsigned16__base__last = 2147483647); -ASSERT (0 <= measuretypes__meter__size); -ASSERT (measuretypes__meter__first = -(200000)); -ASSERT (measuretypes__meter__last = 200000); -ASSERT (measuretypes__meter__base__first = -(2147483647)); -ASSERT (measuretypes__meter__base__last = 2147483647); -ASSERT (0 <= bus__word_index__size); -ASSERT (bus__word_index__first = 1); -ASSERT (bus__word_index__last = 31); -ASSERT (bus__word_index__base__first <= bus__word_index__base__last); -ASSERT (bus__word_index__base__first <= bus__word_index__first); -ASSERT (bus__word_index__last <= bus__word_index__base__last); -ASSERT (0 <= bus__word__size); -ASSERT (bus__word__first = 0); -ASSERT (bus__word__last = 65535); -ASSERT (bus__word__base__first = -(2147483647)); -ASSERT (bus__word__base__last = 2147483647); -ASSERT (0 <= bus__all_msg_index__size); -ASSERT (bus__all_msg_index__first = 0); -ASSERT (bus__all_msg_index__last = 63); -ASSERT (bus__all_msg_index__base__first = -(32768)); -ASSERT (bus__all_msg_index__base__last = 32767); -ASSERT (0 <= bus__lru_subaddress_index__size); -ASSERT (bus__lru_subaddress_index__first = 1); -ASSERT (bus__lru_subaddress_index__last = 8); -ASSERT (bus__lru_subaddress_index__base__first = -(32768)); -ASSERT (bus__lru_subaddress_index__base__last = 32767); -ASSERT (0 <= bc1553__lru_name__size); -ASSERT (bc1553__lru_name__first = bc1553__barometer); -ASSERT (bc1553__lru_name__last = bc1553__warhead); -ASSERT (bc1553__lru_name__base__first = bc1553__barometer); -ASSERT (bc1553__lru_name__base__last = bc1553__warhead); -ASSERT (0 <= ibit__phase__size); -ASSERT (ibit__phase__first = ibit__off); -ASSERT (ibit__phase__last = ibit__timeout); -ASSERT (ibit__phase__base__first = ibit__off); -ASSERT (ibit__phase__base__last = ibit__timeout); -ASSERT (bc1553__barometer = 0); -ASSERT (bc1553__asi = 1); -ASSERT (bc1553__ins = 2); -ASSERT (bc1553__compass = 3); -ASSERT (bc1553__fuel = 4); -ASSERT (bc1553__fuze = 5); -ASSERT (bc1553__radar = 6); -ASSERT (bc1553__infrared = 7); -ASSERT (bc1553__fins = 8); -ASSERT (bc1553__motor = 9); -ASSERT (bc1553__destruct = 10); -ASSERT (bc1553__warhead = 11); -ASSERT (ibit__off = 0); -ASSERT (ibit__request_start = 1); -ASSERT (ibit__in_progress = 2); -ASSERT (ibit__request_stop = 3); -ASSERT (ibit__pass = 4); -ASSERT (ibit__fail = 5); -ASSERT (ibit__timeout = 6); -ASSERT TRUE; -ASSERT (measuretypes__meter__first <= (last_position).z); -ASSERT ((last_position).z <= measuretypes__meter__last); -ASSERT (measuretypes__meter__first <= (last_position).y); -ASSERT ((last_position).y <= measuretypes__meter__last); -ASSERT (measuretypes__meter__first <= (last_position).x); -ASSERT ((last_position).x <= measuretypes__meter__last); -ASSERT TRUE; -ASSERT (ibit__phase__first <= ibit_request); -ASSERT (ibit_request <= ibit__phase__last); -ASSERT (bus__lru_subaddress_index__first <= 1); -ASSERT (1 <= bus__lru_subaddress_index__last); -ASSERT (bc1553__lru_name__first <= bus_id); -ASSERT (bus_id <= bc1553__lru_name__last); -ASSERT TRUE; -ASSERT (bc1553__is_valid(bus_id, 1, bus__inputs) => ((bus__lru_subaddress_index__first <= 1) AND (1 <= bus__lru_subaddress_index__last))); -ASSERT (bc1553__is_valid(bus_id, 1, bus__inputs) => ((bc1553__lru_name__first <= bus_id) AND (bus_id <= bc1553__lru_name__last))); -ASSERT (bc1553__is_valid(bus_id, 1, bus__inputs) => TRUE); -ASSERT bc1553__is_valid(bus_id, 1, bus__inputs); -ASSERT bc1553__is_fresh(bus_id, 1, bus__inputs); -ASSERT (bus__word_index__first <= 2); -ASSERT (2 <= bus__word_index__last); -ASSERT (bus__word_index__first <= 1); -ASSERT (1 <= bus__word_index__last); -ASSERT (measuretypes__meter__first <= (last_position__1).x); -ASSERT ((last_position__1).x <= measuretypes__meter__last); -ASSERT ((last_position__1).y = (last_position).y); -QUERY (last_position = last_position__1); diff --git a/test/regress/regress0/decision/Makefile.am b/test/regress/regress0/decision/Makefile.am index ccf86e8b4..b70ee1575 100644 --- a/test/regress/regress0/decision/Makefile.am +++ b/test/regress/regress0/decision/Makefile.am @@ -23,7 +23,6 @@ TESTS = \ bitvec0.smt \ bitvec0.delta01.smt \ bitvec5.smt \ - quant-Arrays_Q1-noinfer.smt2 \ quant-ex1.smt2 \ uflia-xs-09-16-3-4-1-5.delta03.smt \ aufbv-fuzz01.smt \ @@ -46,17 +45,14 @@ EXTRA_DIST = $(TESTS) \ uflia-xs-09-16-3-4-1-5.delta03.smt.expect \ bitvec0.smt.expect \ bitvec5.smt.expect \ - quant-Arrays_Q1-noinfer.smt2.expect \ wchains010ue.delta02.smt.expect \ bug347.smt.expect \ bug374a.smt.expect \ bug374b.smt2.expect \ - quant-ex1.disable_miniscope.smt2.expect \ wchains010ue.smt.expect \ just_sat.expect \ quant-ex1.smt2.expect \ - just_unsat.expect \ - quant-symmetric_unsat_7.smt2.expect + just_unsat.expect #if CVC4_BUILD_PROFILE_COMPETITION #else diff --git a/test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2 b/test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2 deleted file mode 100644 index 20230a6fa..000000000 --- a/test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2 +++ /dev/null @@ -1,13 +0,0 @@ -(set-logic AUFLIRA) -(set-info :smt-lib-version 2.0) -(set-info :category "industrial") -(set-info :status sat) -(declare-sort U 0) -(declare-fun a () U) -(declare-fun b () U) -(declare-fun f (U) U) -(declare-fun p () Bool) -(assert (and (= a b) (forall ((x U)) (=> (and (= (f x) a) (not (= (f x) b))) p)))) -(check-sat) -(get-info :reason-unknown) -(exit) diff --git a/test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2.expect b/test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2.expect deleted file mode 100644 index 064291040..000000000 --- a/test/regress/regress0/decision/quant-ex1.disable_miniscope.smt2.expect +++ /dev/null @@ -1,3 +0,0 @@ -% COMMAND-LINE: --decision=justification --disable-miniscope-quant-fv --disable-miniscope-quant -% EXPECT: unknown -% EXPECT: (:reason-unknown incomplete) diff --git a/test/regress/regress0/fmf/Makefile.am b/test/regress/regress0/fmf/Makefile.am index 122f9219b..297cdfaf3 100644 --- a/test/regress/regress0/fmf/Makefile.am +++ b/test/regress/regress0/fmf/Makefile.am @@ -20,65 +20,27 @@ MAKEFLAGS = -k # put it below in "TESTS +=" TESTS = \ array_card.smt2 \ - ALG008-1.smt2 \ - german169.smt2 \ QEpres-uf.855035.smt \ - agree467.smt2 \ Arrow_Order-smtlib.778341.smt \ - german73.smt2 \ - PUZ001+1.smt2 \ - refcount24.cvc.smt2 \ - fmf-bound-int.smt2 \ fc-simple.smt2 \ fc-unsat-tot-2.smt2 \ fc-unsat-pent.smt2 \ - fc-pigeonhole19.smt2 \ Hoare-z3.931718.smt \ - bug0909.smt2 \ - lst-no-self-rev-exp.smt2 \ - fib-core.smt2 \ - fore19-exp2-core.smt2 \ - with-ind-104-core.smt2 \ syn002-si-real-int.smt2 \ krs-sat.smt2 \ forall_unit_data2.smt2 \ sc_bad_model_1221.smt2 \ - dt-proper-model.smt2 \ - fd-false.smt2 \ + fd-false.smt2 \ tail_rec.smt2 \ - jasmin-cdt-crash.smt2 \ - loopy_coda.smt2 \ fmc_unsound_model.smt2 \ - am-bad-model.cvc \ - nun-0208-to.smt2 \ - datatypes-ufinite.smt2 \ - datatypes-ufinite-nested.smt2 \ - agree466.smt2 \ - LeftistHeap.scala-8-ncm.smt2 \ - sc-crash-052316.smt2 \ - bound-int-alt.smt2 \ - bug723-irrelevant-funs.smt2 \ bounded_sets.smt2 \ - fmf-strange-bounds.smt2 \ fmf-strange-bounds-2.smt2 \ - fmf-bound-2dim.smt2 \ - memory_model-R_cpp-dd.cvc \ - bug764.smt2 \ - ko-bound-set.cvc \ - cons-sets-bounds.smt2 \ - bug651.smt2 \ bug652.smt2 \ bug782.smt2 \ quant_real_univ.cvc \ - constr-ground-to.smt2 \ bug-041417-set-options.cvc \ - alg202+1.smt2 \ - fmf-fun-no-elim-ext-arith.smt2 \ - fmf-fun-no-elim-ext-arith2.smt2 \ cruanes-no-minimal-unk.smt2 \ no-minimal-sat.smt2 \ - issue916-fmf-or.smt2 \ - pow2-bool.smt2 \ sat-logic.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/ho/Makefile.am b/test/regress/regress0/ho/Makefile.am index 4a7ceb96f..d0903094e 100644 --- a/test/regress/regress0/ho/Makefile.am +++ b/test/regress/regress0/ho/Makefile.am @@ -18,7 +18,7 @@ MAKEFLAGS = -k # These are run for all build profiles. # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" -TESTS = \ +TESTS = \ cong.smt2 \ ext-ho-nested-lambda-model.smt2 \ declare-fun-variants.smt2 \ @@ -32,34 +32,15 @@ TESTS = \ ite-apply-eq.smt2 \ apply-collapse-unsat.smt2 \ apply-collapse-sat.smt2 \ - ho-exponential-model.smt2 \ ext-sat-partial-eval.smt2 \ - ho-std-fmf.smt2 \ - fta0409.smt2 \ - auth0068.smt2 \ modulo-func-equality.smt2 \ ho-matching-enum.smt2 \ - ho-matching-enum-2.smt2 \ ho-matching-nested-app.smt2 \ simple-matching.smt2 \ simple-matching-partial.smt2 EXTRA_DIST = $(TESTS) -# hoa0102.smt2 - - -#if CVC4_BUILD_PROFILE_COMPETITION -#else -#TESTS += \ -# error.cvc -#endif -# -# and make sure to distribute it -#EXTRA_DIST += \ -# error.cvc - - # synonyms for "check" in this directory .PHONY: regress regress0 test regress regress0 test: check diff --git a/test/regress/regress0/nl/Makefile.am b/test/regress/regress0/nl/Makefile.am index e770ca9ba..c10b65931 100644 --- a/test/regress/regress0/nl/Makefile.am +++ b/test/regress/regress0/nl/Makefile.am @@ -21,68 +21,21 @@ MAKEFLAGS = -k # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - quant-nl.smt2 \ - dist-big.smt2 \ - simple-mono.smt2 \ coeff-sat.smt2 \ - combine.smt2 \ magnitude-wrong-1020-m.smt2 \ - nl-unk-quant.smt2 \ mult-po.smt2 \ very-simple-unsat.smt2 \ subs0-unsat-confirm.smt2 \ - simple-mono-unsat.smt2 \ - ones.smt2 \ - metitarski_3_4_2e.smt2 \ - metitarski-1025.smt2 \ - poly-1025.smt2 \ very-easy-sat.smt2 \ - coeff-unsat.smt2 \ - coeff-unsat-base.smt2 \ - red-exp.smt2 \ - zero-subset.smt2 \ nia-wrong-tl.smt2 \ - nl-help-unsat-quant.smt2 \ - metitarski-3-4.smt2 \ - rewriting-sums.smt2 \ - disj-eval.smt2 \ - bug698.smt2 \ real-div-ufnra.smt2 \ - div-mod-partial.smt2 \ - all-logic.smt2 \ - sqrt-problem-1.smt2 \ real-as-int.smt2 \ - nta/bad-050217.smt2 \ - nta/cos-bound.smt2 \ nta/cos-sig-value.smt2 \ - nta/exp_monotone.smt2 \ - nta/shifting2.smt2 \ - nta/shifting.smt2 \ - nta/sin-compare-across-phase.smt2 \ - nta/sin-compare.smt2 \ - nta/sin-sign.smt2 \ - nta/sin-sym2.smt2 \ nta/sin-sym.smt2 \ - nta/tan-rewrite2.smt2 \ nta/tan-rewrite.smt2 \ - nta/arrowsmith-050317.smt2 \ - nta/sin-init-tangents.smt2 \ - nta/cos1-tc.smt2 \ - nta/sin1-ub.smt2 \ - nta/sin1-lb.smt2 \ - nta/sin2-ub.smt2 \ - nta/sin2-lb.smt2 \ nta/exp1-ub.smt2 \ - nta/exp1-lb.smt2 \ - nta/exp-4.5-lt.smt2 \ nta/exp-n0.5-ub.smt2 \ - nta/exp-n0.5-lb.smt2 \ - nta/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 \ - nta/NAVIGATION2.smt2 \ - nta/sin1-sat.smt2 \ - nta/sugar-ident.smt2 \ - nta/sugar-ident-2.smt2 \ - nta/sugar-ident-3.smt2 + nta/exp-n0.5-lb.smt2 # unsolved : garbage_collect.cvc diff --git a/test/regress/regress0/push-pop/Makefile.am b/test/regress/regress0/push-pop/Makefile.am index 0f2508144..06225dfb6 100644 --- a/test/regress/regress0/push-pop/Makefile.am +++ b/test/regress/regress0/push-pop/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = boolean arith . +SUBDIRS = boolean . # don't override a BINARY imported from a personal.mk @mk_if@eq ($(BINARY),) @@ -32,31 +32,18 @@ SMT2_TESTS = \ tiny_bug.smt2 BUG_TESTS = \ - bug216.smt2 \ bug233.cvc \ - bug326.smt2 \ - arith_lra_01.smt2 \ - arith_lra_02.smt2 \ - quant-fun-proc.smt2 \ - quant-fun-proc-unmacro.smt2 \ - quant-fun-proc-unfd.smt2 \ - bug654-dd.smt2 \ - bug-fmf-fun-skolem.smt2 \ - bug674.smt2 \ - inc-double-u.smt2 \ - fmf-fun-dbu.smt2 \ - inc-define.smt2 \ - bug765.smt2 \ - bug691.smt2 \ - bug694-Unapply1.scala-0.smt2 \ - simple_unsat_cores.smt2 \ - bug821.smt2 + quant-fun-proc-unfd.smt2 \ + bug654-dd.smt2 \ + inc-double-u.smt2 \ + inc-define.smt2 \ + bug691.smt2 \ + simple_unsat_cores.smt2 \ + bug821.smt2 TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(BUG_TESTS) -EXTRA_DIST = $(TESTS) \ - bug216.smt2.expect \ - bug396.smt2 +EXTRA_DIST = $(TESTS) # synonyms for "check" in this directory .PHONY: regress regress0 test diff --git a/test/regress/regress0/push-pop/arith/Makefile b/test/regress/regress0/push-pop/arith/Makefile deleted file mode 100644 index d0abd99f5..000000000 --- a/test/regress/regress0/push-pop/arith/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -topdir = ../../../../.. -srcdir = test/regress/regress0/push-pop/arith - -include $(topdir)/Makefile.subdir - -# synonyms for "check" -.PHONY: test -test: check diff --git a/test/regress/regress0/push-pop/arith/Makefile.am b/test/regress/regress0/push-pop/arith/Makefile.am deleted file mode 100644 index e692c86b2..000000000 --- a/test/regress/regress0/push-pop/arith/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -SUBDIRS = . - -# don't override a BINARY imported from a personal.mk -@mk_if@eq ($(BINARY),) -@mk_empty@BINARY = cvc4 -end@mk_if@ - -LOG_COMPILER = @srcdir@/../../../run_regression -AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) - -if AUTOMAKE_1_11 -# old-style (pre-automake 1.12) test harness -TESTS_ENVIRONMENT = \ - $(LOG_COMPILER) \ - $(AM_LOG_FLAGS) $(LOG_FLAGS) -endif - -MAKEFLAGS = -k - -# These are run for all build profiles. -# If a test shouldn't be run in e.g. competition mode, -# put it below in "TESTS +=" - -# Regression tests for SMT inputs -CVC_TESTS = - -SMT2_TESTS = \ - fuzz_3_10.smt2 \ - fuzz_3_11.smt2 \ - fuzz_3_12.smt2 \ - fuzz_3_13.smt2 \ - fuzz_3_14.smt2 \ - fuzz_3_15.smt2 \ - fuzz_3_1.smt2 \ - fuzz_3_2.smt2 \ - fuzz_3_3.smt2 \ - fuzz_3_4.smt2 \ - fuzz_3_5.smt2 \ - fuzz_3_6.smt2 \ - fuzz_3_7.smt2 \ - fuzz_3_8.smt2 \ - fuzz_3_9.smt2 \ - fuzz_5_1.smt2 \ - fuzz_5_2.smt2 \ - fuzz_5_3.smt2 \ - fuzz_5_4.smt2 \ - fuzz_5_5.smt2 \ - fuzz_5_6.smt2 - -BUG_TESTS = - -TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(BUG_TESTS) - -EXTRA_DIST = $(TESTS) - -# synonyms for "check" in this directory -.PHONY: regress regress0 test -regress regress0 test: check - -# do nothing in this subdir -.PHONY: regress1 regress2 regress3 regress4 -regress1 regress2 regress3 regress4: diff --git a/test/regress/regress0/push-pop/boolean/Makefile.am b/test/regress/regress0/push-pop/boolean/Makefile.am index a1eb4fd31..56a27c527 100644 --- a/test/regress/regress0/push-pop/boolean/Makefile.am +++ b/test/regress/regress0/push-pop/boolean/Makefile.am @@ -25,57 +25,24 @@ MAKEFLAGS = -k CVC_TESTS = SMT2_TESTS = \ - fuzz_1.smt2 \ fuzz_2.smt2 \ fuzz_3.smt2 \ - fuzz_4.smt2 \ - fuzz_5.smt2 \ - fuzz_6.smt2 \ - fuzz_7.smt2 \ - fuzz_8.smt2 \ - fuzz_9.smt2 \ - fuzz_10.smt2 \ - fuzz_11.smt2 \ fuzz_12.smt2 \ fuzz_13.smt2 \ fuzz_14.smt2 \ - fuzz_15.smt2 \ - fuzz_16.smt2 \ fuzz_18.smt2 \ - fuzz_19.smt2 \ - fuzz_20.smt2 \ fuzz_21.smt2 \ fuzz_22.smt2 \ - fuzz_23.smt2 \ - fuzz_24.smt2 \ - fuzz_25.smt2 \ - fuzz_26.smt2 \ fuzz_27.smt2 \ - fuzz_28.smt2 \ - fuzz_29.smt2 \ - fuzz_30.smt2 \ fuzz_31.smt2 \ - fuzz_32.smt2 \ fuzz_33.smt2 \ - fuzz_34.smt2 \ - fuzz_35.smt2 \ fuzz_36.smt2 \ - fuzz_37.smt2 \ fuzz_38.smt2 \ - fuzz_39.smt2 \ - fuzz_40.smt2 \ - fuzz_41.smt2 \ - fuzz_42.smt2 \ - fuzz_43.smt2 \ - fuzz_44.smt2 \ - fuzz_45.smt2 \ fuzz_46.smt2 \ fuzz_47.smt2 \ fuzz_48.smt2 \ fuzz_49.smt2 \ - fuzz_50.smt2 \ - fuzz_51.smt2 \ - fuzz_52.smt2 + fuzz_50.smt2 # Disabled because they take too long # fuzz_1_to_52_merged.smt2 \ diff --git a/test/regress/regress0/quantifiers/Makefile.am b/test/regress/regress0/quantifiers/Makefile.am index 64f8b6f16..1711c301e 100644 --- a/test/regress/regress0/quantifiers/Makefile.am +++ b/test/regress/regress0/quantifiers/Makefile.am @@ -22,138 +22,56 @@ TESTS = \ bug269.smt2 \ bug290.smt2 \ bug291.smt2 \ - Arrays_Q1-noinfer.smt2 \ - bignum_quant.smt2 \ bug269.smt2 \ - burns13.smt2 \ - burns4.smt2 \ ex3.smt2 \ ex6.smt2 \ - opisavailable-12.smt2 \ - ricart-agrawala6.smt2 \ - set8.smt2 \ - smtlib384a03.smt2 \ - smtlib46f14a.smt2 \ - smtlibf957ea.smt2 \ - gauss_init_0030.fof.smt2 \ - qcft-javafe.filespace.TreeWalker.006.smt2 \ - qcft-smtlib3dbc51.smt2 \ - javafe.ast.StmtVec.009.smt2 \ ARI176e1.smt2 \ - bi-artm-s.smt2 \ simp-typ-test.smt2 \ macros-int-real.smt2 \ - stream-x2014-09-18-unsat.smt2 \ simp-len.smt2 \ - is-even.smt2 \ is-even-pred.smt2 \ delta-simp.smt2 \ nested-delta.smt2 \ nested-inf.smt2 \ - RND-small.smt2 \ clock-3.smt2 \ - 006-cbqi-ite.smt2 \ cbqi-lia-dt-simp.smt2 \ is-int.smt2 \ floor.smt2 \ - array-unsat-simp3.smt2 \ mix-simp.smt2 \ - mix-coeff.smt2 \ mix-match.smt2 \ ari056.smt2 \ - ext-ex-deq-trigger.smt2 \ matching-lia-1arg.smt2 \ - RND_4_16.smt2 \ - cdt-0208-to.smt2 \ - psyco-196.smt2 \ agg-rew-test.smt2 \ agg-rew-test-cf.smt2 \ - rew-to-0211-dd.smt2 \ rew-to-scala.smt2 \ macros-real-arg.smt2 \ - anti-sk-simp.smt2 \ pure_dt_cbqi.smt2 \ - florian-case-ax.smt2 \ double-pattern.smt2 \ qcf-rel-dom-opt.smt2 \ - parametric-lists.smt2 \ partial-trigger.smt2 \ - inst-max-level-segf.smt2 \ - z3.620661-no-fv-trigger.smt2 \ - bug_743.smt2 \ - quaternion_ds1_symm_0428.fof.smt2 \ bug749-rounding.smt2 \ - RNDPRE_4_1-dd-nqe.smt2 \ mix-complete-strat.smt2 \ - cbqi-sdlx-fixpoint-3-dd.smt2 \ qbv-simp.smt2 \ - psyco-001-bv.smt2 \ - bug822.smt2 \ - qbv-disequality3.smt2 \ qbv-inequality2.smt2 \ - qbv-simple-2vars-vo.smt2 \ qbv-test-invert-bvadd-neq.smt2 \ qbv-test-invert-bvand.smt2 \ qbv-test-invert-bvand-neq.smt2 \ - qbv-test-invert-bvashr-0.smt2 \ qbv-test-invert-bvashr-0-neq.smt2 \ - qbv-test-invert-bvashr-1.smt2 \ qbv-test-invert-bvashr-1-neq.smt2 \ qbv-test-invert-bvlshr-0.smt2 \ qbv-test-invert-bvlshr-0-neq.smt2 \ - qbv-test-invert-bvlshr-1.smt2 \ qbv-test-invert-bvlshr-1-neq.smt2 \ - qbv-test-invert-bvmul.smt2 \ - qbv-test-invert-bvmul-neq.smt2 \ qbv-test-invert-bvor.smt2 \ qbv-test-invert-bvor-neq.smt2 \ qbv-test-invert-bvshl-0.smt2 \ - qbv-test-invert-bvudiv-0.smt2 \ - qbv-test-invert-bvudiv-0-neq.smt2 \ - qbv-test-invert-bvudiv-1.smt2 \ - qbv-test-invert-bvudiv-1-neq.smt2 \ qbv-test-invert-bvult-1.smt2 \ - qbv-test-invert-bvurem-1.smt2 \ - qbv-test-invert-bvurem-1-neq.smt2 \ qbv-test-invert-bvxor.smt2 \ qbv-test-invert-bvxor-neq.smt2 \ qbv-test-invert-concat-0.smt2 \ qbv-test-invert-concat-1.smt2 \ qbv-test-invert-sign-extend.smt2 \ - qbv-test-urem-rewrite.smt2 \ - intersection-example-onelane.proof-node22337.smt2 \ - nested9_true-unreach-call.i_575.smt2 \ - small-pipeline-fixpoint-3.smt2 \ - NUM878.smt2 \ - psyco-107-bv.smt2 \ - ari118-bv-2occ-x.smt2 \ - extract-nproc.smt2 \ - javafe.ast.StandardPrettyPrint.319.smt2 \ - javafe.ast.StmtVec.009.smt2 \ - javafe.ast.WhileStmt.447.smt2 \ clock-10.smt2 \ - javafe.tc.FlowInsensitiveChecks.682.smt2 \ - javafe.tc.CheckCompilationUnit.001.smt2 \ - model_6_1_bv.smt2 \ lra-triv-gn.smt2 - - -# regression can be solved with --finite-model-find --fmf-inst-engine -# set3.smt2 - -# disabled since bvcomp handling is currently disabled -# qbv-test-invert-bvcomp.smt2 - -# disabled, broken by variable elimination (was solved heuristically previously) -# small-bug1-fixpoint-3.smt2 - -# removed because they take more than 20s -# javafe.ast.ArrayInit.35.smt2 - -# FIXME: I've disabled these since they give different error messages on production and debug -# macro-subtype-param.smt2 -# subtype-param-unk.smt2 -# subtype-param.smt2 EXTRA_DIST = $(TESTS) \ bug291.smt2.expect diff --git a/test/regress/regress0/quantifiers/refcount24.cvc b/test/regress/regress0/quantifiers/refcount24.cvc deleted file mode 100644 index 21c9a3cfe..000000000 --- a/test/regress/regress0/quantifiers/refcount24.cvc +++ /dev/null @@ -1,112 +0,0 @@ -% Preamble -------------- -DATATYPE UNIT = Unit END; -DATATYPE BOOL = Truth | Falsity END; - -% Decls -------------- -resource$type: TYPE; -process$type: TYPE; -null: resource$type; -S$elem$type: TYPE = process$type; -S$t$type: TYPE; -S$empty: S$t$type; -S$mem:(S$elem$type, S$t$type) -> BOOL; -S$add:(S$elem$type, S$t$type) -> S$t$type; -S$remove:(S$elem$type, S$t$type) -> S$t$type; -S$cardinality:(S$t$type) -> INT; -S$mem_empty: BOOLEAN = (FORALL (e: S$elem$type): (NOT ((S$mem((e), (S$empty))) = - (Truth)))); -ASSERT S$mem_empty; -S$mem_add: BOOLEAN = (FORALL (x: S$elem$type, y: S$elem$type, s: S$t$type): - ((S$mem((x), (S$add((y), (s))))) = (IF (((x) = (y)) OR - ((S$mem((x), (s))) = - (Truth))) THEN - (Truth) ELSE - (Falsity) ENDIF))); -ASSERT S$mem_add; -S$mem_remove: BOOLEAN = (FORALL (x: S$elem$type, y: S$elem$type, s: S$t$type): - ((S$mem((x), (S$remove((y), (s))))) = (IF ((NOT - ((x) = - (y))) AND - ((S$mem( - (x), (s))) = - (Truth))) THEN - (Truth) ELSE - (Falsity) ENDIF))); -ASSERT S$mem_remove; -S$card_empty: BOOLEAN = ((S$cardinality((S$empty))) = (0)); -ASSERT S$card_empty; -S$card_zero: BOOLEAN = (FORALL (s: S$t$type): (((S$cardinality((s))) = (0)) => - ((s) = (S$empty)))); -ASSERT S$card_zero; -S$card_non_negative: BOOLEAN = (FORALL (s: S$t$type): ((S$cardinality((s))) >= - (0))); -ASSERT S$card_non_negative; -S$card_add: BOOLEAN = (FORALL (x: S$elem$type, s: S$t$type): ((S$cardinality( - (S$add( - (x), (s))))) = - (IF ((S$mem( - (x), (s))) = - (Truth)) THEN - (S$cardinality( - (s))) ELSE ( - (S$cardinality( - (s))) + - (1)) ENDIF))); -ASSERT S$card_add; -S$card_remove: BOOLEAN = (FORALL (x: S$elem$type, s: S$t$type): ((S$cardinality( - (S$remove( - (x), (s))))) = - (IF ( - (S$mem( - (x), (s))) = - (Truth)) THEN ( - (S$cardinality( - (s))) - - (1)) ELSE - (S$cardinality( - (s))) ENDIF))); -ASSERT S$card_remove; - -% Var Decls -------------- -count: ARRAY resource$type OF INT; -ref: ARRAY process$type OF resource$type; -valid: ARRAY resource$type OF BOOL; -destroy$r: resource$type; -valid$1: ARRAY resource$type OF BOOL; - -% Asserts -------------- -ASSERT (NOT ((FORALL (p: process$type): ((NOT - ( - ( - (ref)[ - (p)]) = - (null))) => - (( - (valid)[ - ( - (ref)[ - (p)])]) = - (Truth)))) => - ((NOT ((destroy$r) = (null))) => - ((((valid)[(destroy$r)]) = (Truth)) => - ((((count)[(destroy$r)]) = (0)) => - (((valid$1) = ((valid) WITH [(destroy$r)] := - (Falsity))) => (FORALL - ( - p: process$type): - ( - (NOT - ( - ( - (ref)[ - (p)]) = - (null))) => - ( - ( - (valid$1)[ - ( - (ref)[ - (p)])]) = - (Truth)))))))))); - -CHECKSAT; diff --git a/test/regress/regress0/rels/Makefile.am b/test/regress/regress0/rels/Makefile.am index c8fb739d0..9cdfa5b7b 100644 --- a/test/regress/regress0/rels/Makefile.am +++ b/test/regress/regress0/rels/Makefile.am @@ -22,18 +22,10 @@ MAKEFLAGS = -k # put it below in "TESTS +=" TESTS = \ addr_book_0.cvc \ - bv2.cvc \ oneLoc_no_quant-int_0_1.cvc \ - rel_complex_5.cvc \ rel_join_3_1.cvc \ rel_product_0_1.cvc \ - rel_tc_10_1.cvc \ - rel_tc_6.cvc \ - rel_tp_join_2_1.cvc \ rel_transpose_1_1.cvc \ - strat_0_1.cvc \ - addr_book_1_1.cvc \ - prod-mod-eq2.cvc \ rel_conflict_0.cvc \ rel_join_3.cvc \ rel_product_0.cvc \ @@ -41,83 +33,53 @@ TESTS = \ rel_tc_7.cvc \ rel_tp_join_2.cvc \ rel_transpose_1.cvc \ - strat.cvc \ - addr_book_1.cvc \ - join-eq-structure_0_1.cvc \ - prod-mod-eq.cvc \ rel_join_0_1.cvc \ rel_join_4.cvc \ rel_product_1_1.cvc \ rel_tc_2_1.cvc \ rel_tp_join_3.cvc \ rel_transpose_3.cvc \ - bv1.cvc \ - join-eq-structure-and.cvc \ rel_1tup_0.cvc \ rel_join_0.cvc \ rel_join_5.cvc \ rel_product_1.cvc \ rel_tc_3_1.cvc \ - rel_tc_9_1.cvc \ rel_tp_join_eq_0.cvc \ rel_transpose_4.cvc \ - bv1p.cvc \ - join-eq-structure.cvc \ rel_complex_0.cvc \ rel_join_1_1.cvc \ rel_join_6.cvc \ rel_symbolic_1_1.cvc \ rel_tc_3.cvc \ - rel_tp_2.cvc \ rel_tp_join_int_0.cvc \ rel_transpose_5.cvc \ - bv1p-sat.cvc \ join-eq-u.cvc \ rel_complex_1.cvc \ rel_join_1.cvc \ rel_join_7.cvc \ rel_symbolic_1.cvc \ - rel_tc_4_1.cvc \ rel_tp_3_1.cvc \ rel_tp_join_pro_0.cvc \ rel_transpose_6.cvc \ - bv1-unitb.cvc \ join-eq-u-sat.cvc \ - rel_complex_3.cvc \ rel_join_2_1.cvc \ - rel_mix_0_1.cvc \ rel_symbolic_2_1.cvc \ - rel_tc_4.cvc \ rel_tp_join_0.cvc \ rel_tp_join_var_0.cvc \ rel_transpose_7.cvc \ - bv1-unit.cvc \ - rel_complex_4.cvc \ rel_join_2.cvc \ - rel_pressure_0.cvc \ rel_symbolic_3_1.cvc \ - rel_tc_5_1.cvc \ rel_tp_join_1.cvc \ rel_transpose_0.cvc \ - set-strat.cvc \ rel_tc_8.cvc \ atom_univ2.cvc \ rels-sharing-simp.cvc \ iden_0.cvc \ - iden_1_1.cvc \ iden_1.cvc \ - joinImg_0_1.cvc \ - joinImg_0_2.cvc \ joinImg_0.cvc \ - joinImg_1_1.cvc \ - joinImg_1.cvc \ - joinImg_2_1.cvc \ - joinImg_2.cvc \ card_transpose.cvc \ relations-ops.smt2 -# unsolved : garbage_collect.cvc - EXTRA_DIST = $(TESTS) # synonyms for "check" diff --git a/test/regress/regress0/rewriterules/Makefile.am b/test/regress/regress0/rewriterules/Makefile.am index fcaa9dc2b..5df254bad 100644 --- a/test/regress/regress0/rewriterules/Makefile.am +++ b/test/regress/regress0/rewriterules/Makefile.am @@ -23,14 +23,12 @@ MAKEFLAGS = -k # put it below in "TESTS +=" TESTS = \ length_trick.smt2 \ - length_gen_020.smt2 \ datatypes.smt2 \ - datatypes_sat.smt2 \ relation.smt2 \ simulate_rewriting.smt2 \ native_arrays.smt2 -# length_trick2.smt2 reachability_bbttf_eT_arrays.smt2 set_A_new_fast_tableau-base.smt2 set_A_new_fast_tableau-base_sat.smt2 +# length_trick2.smt2 reachability_bbttf_eT_arrays.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/rewriterules/length_gen_1280.smt2 b/test/regress/regress0/rewriterules/length_gen_1280.smt2 deleted file mode 100644 index b613844ce..000000000 --- a/test/regress/regress0/rewriterules/length_gen_1280.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 1280 nil)) 1280))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_1280_lemma_trigger.smt2 b/test/regress/regress0/rewriterules/length_gen_1280_lemma_trigger.smt2 deleted file mode 100644 index 7d1cf3203..000000000 --- a/test/regress/regress0/rewriterules/length_gen_1280_lemma_trigger.smt2 +++ /dev/null @@ -1,35 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (!(= (length (cons ?e ?l)) (+ 1 (length ?l))) :pattern ((length (cons ?e ?l))) ))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :pattern ((gen_cons ?n ?l)) ))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) - :pattern ((gen_cons ?n ?l)) ))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 1280 nil)) 1280))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_160.smt2 b/test/regress/regress0/rewriterules/length_gen_160.smt2 deleted file mode 100644 index 339c70bb5..000000000 --- a/test/regress/regress0/rewriterules/length_gen_160.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 160 nil)) 160))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_160_lemma_trigger.smt2 b/test/regress/regress0/rewriterules/length_gen_160_lemma_trigger.smt2 deleted file mode 100644 index 65d0c9570..000000000 --- a/test/regress/regress0/rewriterules/length_gen_160_lemma_trigger.smt2 +++ /dev/null @@ -1,35 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (!(= (length (cons ?e ?l)) (+ 1 (length ?l))) :pattern ((length (cons ?e ?l))) ))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :pattern ((gen_cons ?n ?l)) ))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) - :pattern ((gen_cons ?n ?l)) ))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 160 nil)) 160))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_160_sat.smt2 b/test/regress/regress0/rewriterules/length_gen_160_sat.smt2 deleted file mode 100644 index e2ed52faf..000000000 --- a/test/regress/regress0/rewriterules/length_gen_160_sat.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status sat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 160 nil)) 1600))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_2560.smt2 b/test/regress/regress0/rewriterules/length_gen_2560.smt2 deleted file mode 100644 index 2aff61656..000000000 --- a/test/regress/regress0/rewriterules/length_gen_2560.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 2560 nil)) 2560))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_2560_sat.smt2 b/test/regress/regress0/rewriterules/length_gen_2560_sat.smt2 deleted file mode 100644 index 3e88e781f..000000000 --- a/test/regress/regress0/rewriterules/length_gen_2560_sat.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 2560 nil)) 25600))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_640.smt2 b/test/regress/regress0/rewriterules/length_gen_640.smt2 deleted file mode 100644 index f1dc6bbf2..000000000 --- a/test/regress/regress0/rewriterules/length_gen_640.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 640 nil)) 640))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_640_lemma.smt2 b/test/regress/regress0/rewriterules/length_gen_640_lemma.smt2 deleted file mode 100644 index 29d0f1aca..000000000 --- a/test/regress/regress0/rewriterules/length_gen_640_lemma.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (= (length (cons ?e ?l)) (+ 1 (length ?l))))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)))) - -(assert (forall ((?n Int) (?l list)) (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 640 nil)) 640))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_640_sat.smt2 b/test/regress/regress0/rewriterules/length_gen_640_sat.smt2 deleted file mode 100644 index 958c2c730..000000000 --- a/test/regress/regress0/rewriterules/length_gen_640_sat.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (gen_cons (- ?n 1) (cons 1 ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 640 nil)) 6400))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/length_gen_inv_1280.smt2 b/test/regress/regress0/rewriterules/length_gen_inv_1280.smt2 deleted file mode 100644 index 30e3bc864..000000000 --- a/test/regress/regress0/rewriterules/length_gen_inv_1280.smt2 +++ /dev/null @@ -1,34 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort list 0) - -(declare-fun cons (Int list) list) -(declare-fun nil () list) - - -;;define length -(declare-fun length (list) Int) - -(assert (= (length nil) 0)) - -(assert (forall ((?e Int) (?l list)) (! (= (length (cons ?e ?l)) (+ 1 (length ?l))) :rewrite-rule))) - -(declare-fun gen_cons (Int list) list) - -(assert (forall ((?n Int) (?l list)) (! (=> (= ?n 0) (= (gen_cons ?n ?l) ?l)) :rewrite-rule))) - -(assert (forall ((?n Int) (?l list)) (! (=> (> ?n 0) (= (gen_cons ?n ?l) - (cons 1 (gen_cons (- ?n 1) ?l)))) :rewrite-rule))) - -(declare-fun n () Int) - -(assert (not (= (length (gen_cons 1280 nil)) 1280))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/native_datatypes2.smt2 b/test/regress/regress0/rewriterules/native_datatypes2.smt2 deleted file mode 100644 index f19e5097b..000000000 --- a/test/regress/regress0/rewriterules/native_datatypes2.smt2 +++ /dev/null @@ -1,35 +0,0 @@ -;; Same than length.smt2 but the nil case is not a rewrite rule -;; So here the rewrite rules have no guards length - -(set-info :status unsat) - -(declare-datatypes ((nat 0) (list 0)) ( -((succ (pred nat)) (zero ) ) -((cons (car nat)(cdr list)) (nil ) ) - -)) - - -;;define length -(declare-fun length (list) nat) - -(assert (= (length nil) zero)) - -(assert-rewrite ((?e nat) (?l list)) () (length (cons ?e ?l)) (succ (length ?l)) () ) -(assert-propagation ((?l list)) ((= (length ?l) zero)) () (= ?l nil) (((length ?l))) ) -;(assert-propagation ((?l list)) () () (= ?l nil) (((= (length ?l) 0))) ) - -(declare-fun gen_cons (nat list) list) - -(assert-rewrite ((?l list)) () (gen_cons zero ?l) ?l () ) - -(assert-rewrite ((?n nat) (?l list)) () (gen_cons (succ ?n) ?l) (gen_cons ?n (cons zero ?l)) () ) - -(declare-fun l1 () list) -(declare-fun l2 () list) - -(assert (not (=> (= (length l1) zero) (= l1 nil)))) - -(check-sat) - -(exit) diff --git a/test/regress/regress0/rewriterules/reachability_back_to_the_future_extended.smt2 b/test/regress/regress0/rewriterules/reachability_back_to_the_future_extended.smt2 deleted file mode 100644 index 955c810aa..000000000 --- a/test/regress/regress0/rewriterules/reachability_back_to_the_future_extended.smt2 +++ /dev/null @@ -1,72 +0,0 @@ -;; Back to the Future ... Shuvendu K.Lhiri, Shaz Qadeer -(set-logic AUFLIA) -(set-info :status unsat) - -(declare-sort elt 0) - -(declare-fun f (elt) elt) -(declare-fun Rf (elt elt elt) Bool) - -;;eq -(assert-propagation ((?x elt)) () () (or (= ?x ?x) (not (= ?x ?x))) ((?x)) ) -;; reflexive -(assert-propagation ((?x elt)) () () (Rf ?x ?x ?x) ((?x)) ) -;; step -(assert-propagation ((?x elt)) () () (Rf ?x (f ?x) (f ?x)) (((f ?x))) ) - -;; reach -(assert-propagation ((?x1 elt)(?x2 elt)) () ((Rf ?x1 ?x2 ?x2)) (or (= ?x1 ?x2) (Rf ?x1 (f ?x1) ?x2)) (((f ?x1))) ) -;; reach extended -(assert-propagation ((?x1 elt)(?x2 elt)) ((not (= ?x1 ?x2))(Rf ?x1 ?x2 ?x2)) () (Rf ?x1 (f ?x1) ?x2) (((Rf ?x1 (f ?x1) ?x2))) ) -;; reach extended -(assert-propagation ((?x1 elt)(?x2 elt)) ((not (Rf ?x1 (f ?x1) ?x2))(Rf ?x1 ?x2 ?x2)) () (= ?x1 ?x2) (((Rf ?x1 (f ?x1) ?x2))) ) - -;; cycle -(assert-propagation ((?x1 elt)(?x2 elt)) ((= (f ?x1) ?x1)) ((Rf ?x1 ?x2 ?x2)) (= ?x1 ?x2) (((f ?x1))) ) -;; sandwich -(assert-propagation ((?x1 elt)(?x2 elt)) () ((Rf ?x1 ?x2 ?x1)) (= ?x1 ?x2) () ) -;; order1 -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)) - (or (Rf ?x1 ?x2 ?x3) (Rf ?x1 ?x3 ?x2)) () ) -;; order1 extended -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () - (Rf ?x1 ?x2 ?x3) (((Rf ?x1 ?x2 ?x3))) ) -;; order1 extended -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () - (Rf ?x1 ?x3 ?x2) (((Rf ?x1 ?x3 ?x2))) ) - -;; order2 -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x1 ?x2 ?x3)) - (and (Rf ?x1 ?x2 ?x2) (Rf ?x2 ?x3 ?x3)) () ) -;; transitive1 -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x1 ?x2 ?x2)(Rf ?x2 ?x3 ?x3)) - (Rf ?x1 ?x3 ?x3) () ) -;; transitive2 -(assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x0 ?x1 ?x2)(Rf ?x1 ?x3 ?x2)) - (and (Rf ?x0 ?x1 ?x3) (Rf ?x0 ?x3 ?x2)) () ) -;;transitive3 -(assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x0 ?x1 ?x2)(Rf ?x0 ?x3 ?x1)) - (and (Rf ?x0 ?x3 ?x2) (Rf ?x3 ?x1 ?x2)) () ) - -(declare-fun e1 () elt) -(declare-fun e2 () elt) -(declare-fun e3 () elt) -(declare-fun e4 () elt) - - -(assert (and (hack e1) (hack e2) (hack e3) (hack e4) (hack (f e1)))) - - -;; (assert (=> (Rf e1 e2 e3) (Rf e1 (f e1) (f e1)) )) - -;; (assert (=> (Rf e1 e2 e3) (Rf e1 e3 e3) )) - -;; (assert (=> (Rf e1 e2 e3) (or (= e1 e3) (Rf e1 (f e1) e3)) )) - -;;(assert (not (=> (and (not (= e1 e2)) (Rf e1 e2 e3)) (Rf e1 (f e1) e3) ))) - -(assert (and (not (= e1 e2)) (Rf e1 e2 e3) (not (Rf e1 (f e1) e3)) )) - - -(check-sat) -(exit) \ No newline at end of file diff --git a/test/regress/regress0/rewriterules/reachability_bbttf_eT_arrays.smt2 b/test/regress/regress0/rewriterules/reachability_bbttf_eT_arrays.smt2 deleted file mode 100644 index 8f30f38a5..000000000 --- a/test/regress/regress0/rewriterules/reachability_bbttf_eT_arrays.smt2 +++ /dev/null @@ -1,330 +0,0 @@ -;; Back to the Future ... Shuvendu K.Lhiri, Shaz Qadeer -(set-logic AUFLIA) -(set-info :status unsat) - -(declare-sort elt 0) -(define-sort mem () (Array elt elt)) - -(declare-fun R (mem elt elt elt) Bool) - -;; reflexive -(assert-propagation ((?m mem)(?x elt)) ((?m ?x)) () () (R ?m ?x ?x ?x) ) -;; step -(assert-propagation ((?m mem)(?x elt)) (((select ?m ?x))) () () (R ?m ?x (select ?m ?x) (select ?m ?x)) ) -;; (assert-propagation ((?x elt)) (f ?x)))) () () (Rf ?x (f ?x) (f ?x)) (((Rf ?x (f ?x) ) -;; (assert-propagation ((?x elt)) (((f ?x))) () () (=> true (Rf ?x (f ?x) (f ?x))) ) - -;; reach -(assert-propagation ((?m mem)(?x1 elt)(?x2 elt)) (((select ?m ?x1))) () ((R ?m ?x1 ?x2 ?x2)) (or (= ?x1 ?x2) (R ?m ?x1 (select ?m ?x1) ?x2)) ) -;; ;; reach extended -;; (assert-propagation ((?x1 elt)(?x2 elt)) (((Rf ?x1 (f ?x1) ?x2))) ((not (= ?x1 ?x2))(Rf ?x1 ?x2 ?x2)) () (Rf ?x1 (f ?x1) ?x2) ) -;; ;; reach extended -;; (assert-propagation ((?x1 elt)(?x2 elt)) (((Rf ?x1 (f ?x1) ?x2))) ((not (Rf ?x1 (f ?x1) ?x2))(Rf ?x1 ?x2 ?x2)) () (= ?x1 ?x2) ) - -;; cycle -(assert-propagation ((?m mem)(?x1 elt)(?x2 elt)) (((select ?m ?x1))) ((= (select ?m ?x1) ?x1)) ((R ?m ?x1 ?x2 ?x2)) (= ?x1 ?x2) ) -;; (assert-propagation ((?x1 elt)(?x2 elt)) () ((= (f ?x1) ?x1)) ((Rf ?x1 ?x2 ?x2)) (= ?x1 ?x2) ) - -;; (assert-propagation ((?x1 elt)(?x2 elt)) (((Rf ?x1 ?x2 ?x2)(f ?x1))) () () (=> (and (= (f ?x1) ?x1) (Rf ?x1 ?x2 ?x2)) (= ?x1 ?x2)) ) - -;; sandwich -(assert-propagation ((?m mem)(?x1 elt)(?x2 elt)) () () ((R ?m ?x1 ?x2 ?x1)) (= ?x1 ?x2) ) -;; (assert-propagation ((?x1 elt)(?x2 elt)) (((Rf ?x1 ?x2 ?x1))) () () (=> (Rf ?x1 ?x2 ?x1) (= ?x1 ?x2)) ) - -;; order1 -(assert-propagation ((?m mem)(?x1 elt)(?x2 elt)(?x3 elt)) () () - ((R ?m ?x1 ?x2 ?x2)(R ?m ?x1 ?x3 ?x3)) (or (R ?m ?x1 ?x2 ?x3) (R ?m ?x1 ?x3 ?x2)) ) - -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3))) () () -;; (=> (and (Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)) (or (Rf ?x1 ?x2 ?x3) (Rf ?x1 ?x3 ?x2))) ) - -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x2 ?x3))) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () -;; (Rf ?x1 ?x2 ?x3) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x3 ?x2))) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () -;; (Rf ?x1 ?x3 ?x2) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x3 ?x2))) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () -;; (Rf ?x1 ?x2 ?x3) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x2 ?x3))) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () -;; (Rf ?x1 ?x3 ?x2) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3))) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () -;; (Rf ?x1 ?x2 ?x3) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3))) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () -;; (Rf ?x1 ?x3 ?x2) ) - -;; order2 -(assert-propagation ((?m mem)(?x1 elt)(?x2 elt)(?x3 elt)) () () ((R ?m ?x1 ?x2 ?x3)) - (and (R ?m ?x1 ?x2 ?x2) (R ?m ?x2 ?x3 ?x3)) ) -;; transitive1 -(assert-propagation ((?m mem)(?x1 elt)(?x2 elt)(?x3 elt)) () () ((R ?m ?x1 ?x2 ?x2)(R ?m ?x2 ?x3 ?x3)) - (R ?m ?x1 ?x3 ?x3) ) -;; ;; transitive1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () () ((not (Rf ?x1 ?x3 ?x3))(Rf ?x2 ?x3 ?x3)) -;; (not (Rf ?x1 ?x2 ?x2)) ) -;; ;; transitive1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () () ((Rf ?x1 ?x2 ?x2)(not (Rf ?x1 ?x3 ?x3))) -;; (not (Rf ?x2 ?x3 ?x3)) ) - -;;transitive2 -(assert-propagation ((?m mem)(?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () () ((R ?m ?x0 ?x1 ?x2)(R ?m ?x1 ?x3 ?x2)) - (and (R ?m ?x0 ?x1 ?x3) (R ?m ?x0 ?x3 ?x2)) ) - -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x0 ?x1 ?x2)(Rf ?x1 ?x3 ?x2))) () () -;; (=> (and (Rf ?x0 ?x1 ?x2)(Rf ?x1 ?x3 ?x2)) -;; (and (Rf ?x0 ?x1 ?x3) (Rf ?x0 ?x3 ?x2))) -;; ) - -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x0 ?x1 ?x2))) () ((not (Rf ?x0 ?x1 ?x3))(Rf ?x1 ?x3 ?x2)) -;; (not (Rf ?x0 ?x1 ?x2)) ) -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x3 ?x2))) () ((Rf ?x0 ?x1 ?x2)(not (Rf ?x0 ?x1 ?x3))) -;; (not (Rf ?x1 ?x3 ?x2)) ) -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x0 ?x1 ?x2))) () ((not (Rf ?x0 ?x3 ?x2))(Rf ?x1 ?x3 ?x2)) -;; (not (Rf ?x0 ?x1 ?x2)) ) -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x1 ?x3 ?x2))) () ((Rf ?x0 ?x1 ?x2)(not (Rf ?x0 ?x3 ?x2))) -;; (not (Rf ?x1 ?x3 ?x2)) ) - -;; ;;transitive3 -(assert-propagation ((?m mem)(?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () () ((R ?m ?x0 ?x1 ?x2)(R ?m ?x0 ?x3 ?x1)) - (and (R ?m ?x0 ?x3 ?x2) (R ?m ?x3 ?x1 ?x2)) ) - -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) (((Rf ?x0 ?x1 ?x2)(Rf ?x0 ?x3 ?x1))) () () -;; (=> (and (Rf ?x0 ?x1 ?x2)(Rf ?x0 ?x3 ?x1)) -;; (and (Rf ?x0 ?x3 ?x2) (Rf ?x3 ?x1 ?x2))) ) - - -(declare-fun next () mem) - -(declare-fun e1 () elt) -(declare-fun e2 () elt) -(declare-fun e3 () elt) -(declare-fun e4 () elt) - - - -(declare-fun R_avoid (mem elt elt elt) Bool) - -(assert-rewrite ((?m mem)(?x0 elt)(?x1 elt)(?exc elt)) () () (R_avoid ?m ?x0 ?x1 ?exc) - (or (R ?m ?x0 ?x1 ?exc) (and (R ?m ?x0 ?x1 ?x1) (not (R ?m ?x0 ?exc ?exc)))) ) - - -;; Identity of Back to the future p175 -(assert-rewrite ((?p elt)(?q elt)(?u elt)(?v elt)(?w elt)(?m mem)) () () (R (store ?m ?p ?q) ?u ?v ?w) - (or (and (R ?m ?u ?v ?w) (R_avoid ?m ?u ?w ?p) ) - (and (not (= ?p ?w)) (R_avoid ?m ?u ?p ?w) (R ?m ?u ?v ?p) (R_avoid ?m ?q ?w ?p) ) - (and (not (= ?p ?w)) (R_avoid ?m ?u ?p ?w) (R ?m ?q ?v ?w) (R_avoid ?m ?q ?w ?p) ) ) - ) - - - -(declare-fun join (mem elt elt) elt) - -(declare-fun null () elt) -(assert (= (select next null) null)) - -(assert-propagation ((?m mem)(?x elt)(?y elt)(?z elt)) (((join ?m ?x ?y))) () ((R ?m ?x ?z ?z)(R ?m ?y ?z ?z)) (R ?m ?x (join ?m ?x ?y) ?z) ) -(assert-propagation ((?m mem)(?x elt)(?y elt)) (((join ?m ?x ?y))) () () (or (and (R ?m ?x (join ?m ?x ?y) (join ?m ?x ?y)) (R ?m ?y (join ?m ?x ?y) (join ?m ?x ?y))) (= (join ?m ?x ?y) null)) ) - -;;extended join -(assert-propagation ((?m mem)(?x elt)(?y elt)(?z elt)) () () ((R ?m ?x ?z (join ?m ?x ?y))(R ?m ?y ?z (join ?m ?x ?y))) (= ?z (join ?m ?x ?y)) ) - - -(assert-propagation ((?p elt)(?q elt)(?m mem)(?u elt)(?v elt)) (((join (store ?m ?p ?q) ?u ?v))) () () - (= (join (store ?m ?p ?q) ?u ?v) - (let ((jp (join ?m ?u ?v))) - ;; In ?m: ?u ?v have a nearest point of junction (join ?m ?u ?v) - (ite (and (R ?m ?u jp jp) (R ?m ?v jp jp)) - ;; The modification is in the ?u branch - (ite (R ?m ?u ?p jp) - ;; we can go by the new path and the new path doesn't cycle - (ite (and (R (store ?m ?p ?q) ?u ?p ?q) (R (store ?m ?p ?q) ?q (join ?m ?q ?v) (join ?m ?q ?v))) - (join ?m ?q ?v) - ;; we can't - null - ) - ;; The modification is in the ?v branch - (ite (R ?m ?v ?p jp) - ;; we can go by the new path and the new path doesn't cycle - (ite (and (R (store ?m ?p ?q) ?v ?p ?q) (R (store ?m ?p ?q) ?q (join ?m ?u ?q) (join ?m ?u ?q))) - (join ?m ?u ?q) - ;; we can't - null - ) - ;; The modification is not before the point of junction - (join ?m ?u ?v) - )) - ;; In ?m: ?u ?v doens't have a point of junction - ;;The modification is accesible from ?u - (ite (R ?m ?u ?p ?p) (join ?m ?q ?v) - ;;The modification is accesible from ?v - (ite (R ?m ?v ?p ?p) (join ?m ?u ?q) - ;;The modification is accesible neither from ?u neither from ?v - (join ?m ?u ?v) - ) - ) - ) - )) - ) - -(declare-fun next2 () mem) - -;; === Example 0 === -;; (assert (not (=> -;; (and (not (= e1 e2)) -;; (R next e1 e2 e3)) -;; (R next e1 (select next e1) e3)) -;; )) - -;;================ -;;Thomas' example1 x,e1 y,e2 z,e3 y',e4 -;;================ -;; (assert (not (=> -;; (and (R next e1 e2 e3) -;; (not (= e2 e3)) -;; (= e4 (select next e2))) -;; (R next e1 e4 e3)) -;; )) - - -;;=================== -;; ;;Thomas' example2 -;;=================== - -;; (assert (not (=> -;; (and (R next e1 null null) -;; (= (join next e1 e2) null) -;; (= next2 (store next e2 e1)) -;; ) -;; (R next2 e1 null null) -;; ) -;; ) -;; ) - - -;;================ -;;Thomas' example3 -;;================ -(assert (not (=> (and (= (join next e1 e2) null) - (R next e2 null null) - (not (= e2 null)) - (= next2 (store next e2 e1)) - (= e3 e2) - (= e4 (select next e2)) - ) - (= (join next2 e3 e4) null) - ) - ) - ) - -;; ==== for debugging example 3 ==== -;; ;;case to consider -;; ;;(assert (or (not (R next e1 null null)) (R next e1 null null))) - -;; ;;first case to consider -;; ;;(assert (R next e1 null null)) - -;; ;;second case to consider -;; ;; (assert (not (R next e1 null null))) - - -;; ;;hyp -;; (assert (= (join next e1 e2) null)) -;; (assert (R next e2 null null)) -;; (assert (not (= e2 null))) -;; (assert (= next2 (store next e2 e1))) -;; (assert (= e3 e2)) -;; (assert (= e4 (select next e2))) - -;; ;; help -;; ;; have a join point -;; ;; (assert (R next e2 e4 e4)) -;; ;; (assert (R next e4 e4 e4)) - -;; ;; (assert (R next e2 (join next e2 e4) e4)) -;; ;; (assert (not (R next e4 e2 e2))) - -;; ;; (assert (not (= e2 (join next e2 e4))));; slow with efficient (/axioms) - -;; ;; (assert (= e4 (join next e2 e4))) ;; unprovable with efficient (/axioms) -;; ;; in e2 branch -;; ;; (assert (not (R next e4 e2 null))) ;; -;; ;; the auxillary join -;; ;; (assert (= (join next2 e1 e4) null)) - - -;; ;;to prove -;; (assert (not (= (join next2 e3 e4) null))) - - -;;==================== -;; ;;Thomas' example wrong sat? -;;==================== - -;; (assert (not (=> (and -;; (= (join next e1 e2) null) -;; (R next e2 null null) -;; (not (= e2 null)) -;; (= next2 (store next e2 e1)) -;; ) -;; (= (join next2 e1 e2) null) -;; ) -;; ) -;; ) - -;;==================== -;; ;;example4 sat -;;==================== - -;; (assert (not (=> (and -;; (= (join next e1 e2) null) -;; (R next e2 null null) (not (= e2 null)) -;; ) -;; (not (R next e2 e2 e2)) -;; ))) - - -;;==================== -;;example5 unsat -;;==================== - -;; (assert (and -;; ;; (= (join e1 e2) null) -;; (= (select next (select next e1)) e1) -;; (R next e1 e2 e2) -;; (not (= e2 e1)) -;; (not (= e2 (select next e1))) -;; ) -;; ) - -;;==================== -;; ;; example 6 unsat -;;==================== - -;; ;; join is the nearest junction point -;; (assert (and (not (= e3 (join next e1 e2))) -;; (R next e1 e3 (join next e1 e2)) -;; (R next e2 e3 (join next e1 e2)) -;; )) - - -;;==================== -;; example7 unsat -;;==================== - -;; (assert (R next e1 e2 (select next e1))) -;; (assert (not (= e1 e2))) -;; (assert (not (= e2 (select next e1)))) - - - -(check-sat) -(exit) - diff --git a/test/regress/regress0/rewriterules/reachability_bttf_ext_Thomas.smt2 b/test/regress/regress0/rewriterules/reachability_bttf_ext_Thomas.smt2 deleted file mode 100644 index 92103238c..000000000 --- a/test/regress/regress0/rewriterules/reachability_bttf_ext_Thomas.smt2 +++ /dev/null @@ -1,211 +0,0 @@ -;; Back to the Future ... Shuvendu K.Lhiri, Shaz Qadeer -(set-logic AUFLIA) -(set-info :status unsat) - -(declare-sort elt 0) - -(declare-fun f (elt) elt) -(declare-fun Rf (elt elt elt) Bool) - -;; reflexive -;;(assert-propagation ((?x elt)) () () (Rf ?x ?x ?x) ((?x)) ) -;; step -(assert-propagation ((?x elt)) () () (Rf ?x (f ?x) (f ?x)) (((f ?x))) ) -;; (assert-propagation ((?x elt)) () () (Rf ?x (f ?x) (f ?x)) (((Rf ?x (f ?x) (f ?x)))) ) -;; (assert-propagation ((?x elt)) () () (=> true (Rf ?x (f ?x) (f ?x))) (((f ?x))) ) - -;; reach -(assert-propagation ((?x1 elt)(?x2 elt)) () ((Rf ?x1 ?x2 ?x2)) (or (= ?x1 ?x2) (Rf ?x1 (f ?x1) ?x2)) (((f ?x1))) ) -;; ;; reach extended -;; (assert-propagation ((?x1 elt)(?x2 elt)) ((not (= ?x1 ?x2))(Rf ?x1 ?x2 ?x2)) () (Rf ?x1 (f ?x1) ?x2) (((Rf ?x1 (f ?x1) ?x2))) ) -;; ;; reach extended -;; (assert-propagation ((?x1 elt)(?x2 elt)) ((not (Rf ?x1 (f ?x1) ?x2))(Rf ?x1 ?x2 ?x2)) () (= ?x1 ?x2) (((Rf ?x1 (f ?x1) ?x2))) ) - -;; cycle -(assert-propagation ((?x1 elt)(?x2 elt)) ((= (f ?x1) ?x1)) ((Rf ?x1 ?x2 ?x2)) (= ?x1 ?x2) (((f ?x1))) ) -;; (assert-propagation ((?x1 elt)(?x2 elt)) ((= (f ?x1) ?x1)) ((Rf ?x1 ?x2 ?x2)) (= ?x1 ?x2) () ) - -;; (assert-propagation ((?x1 elt)(?x2 elt)) () () (=> (and (= (f ?x1) ?x1) (Rf ?x1 ?x2 ?x2)) (= ?x1 ?x2)) (((Rf ?x1 ?x2 ?x2)(f ?x1))) ) - -;; sandwich -(assert-propagation ((?x1 elt)(?x2 elt)) () ((Rf ?x1 ?x2 ?x1)) (= ?x1 ?x2) () ) -;; (assert-propagation ((?x1 elt)(?x2 elt)) () () (=> (Rf ?x1 ?x2 ?x1) (= ?x1 ?x2)) (((Rf ?x1 ?x2 ?x1))) ) - -;; order1 -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () - ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)) (or (Rf ?x1 ?x2 ?x3) (Rf ?x1 ?x3 ?x2)) () ) - -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () () -;; (=> (and (Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)) (or (Rf ?x1 ?x2 ?x3) (Rf ?x1 ?x3 ?x2))) (((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3))) ) - -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () -;; (Rf ?x1 ?x2 ?x3) (((Rf ?x1 ?x2 ?x3))) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () -;; (Rf ?x1 ?x3 ?x2) (((Rf ?x1 ?x3 ?x2))) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () -;; (Rf ?x1 ?x2 ?x3) (((Rf ?x1 ?x3 ?x2))) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () -;; (Rf ?x1 ?x3 ?x2) (((Rf ?x1 ?x2 ?x3))) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x3 ?x2))) () -;; (Rf ?x1 ?x2 ?x3) (((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3))) ) -;; ;; order1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) ((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3)(not (Rf ?x1 ?x2 ?x3))) () -;; (Rf ?x1 ?x3 ?x2) (((Rf ?x1 ?x2 ?x2)(Rf ?x1 ?x3 ?x3))) ) - -;; order2 -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x1 ?x2 ?x3)) - (and (Rf ?x1 ?x2 ?x2) (Rf ?x2 ?x3 ?x3)) () ) -;; transitive1 -(assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x1 ?x2 ?x2)(Rf ?x2 ?x3 ?x3)) - (Rf ?x1 ?x3 ?x3) () ) -;; ;; transitive1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((not (Rf ?x1 ?x3 ?x3))(Rf ?x2 ?x3 ?x3)) -;; (not (Rf ?x1 ?x2 ?x2)) () ) -;; ;; transitive1 extended -;; (assert-propagation ((?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x1 ?x2 ?x2)(not (Rf ?x1 ?x3 ?x3))) -;; (not (Rf ?x2 ?x3 ?x3)) () ) - -;;transitive2 -(assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x0 ?x1 ?x2)(Rf ?x1 ?x3 ?x2)) - (and (Rf ?x0 ?x1 ?x3) (Rf ?x0 ?x3 ?x2)) () ) - -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () () -;; (=> (and (Rf ?x0 ?x1 ?x2)(Rf ?x1 ?x3 ?x2)) -;; (and (Rf ?x0 ?x1 ?x3) (Rf ?x0 ?x3 ?x2))) -;; (((Rf ?x0 ?x1 ?x2)(Rf ?x1 ?x3 ?x2))) ) - -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((not (Rf ?x0 ?x1 ?x3))(Rf ?x1 ?x3 ?x2)) -;; (not (Rf ?x0 ?x1 ?x2)) (((Rf ?x0 ?x1 ?x2))) ) -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x0 ?x1 ?x2)(not (Rf ?x0 ?x1 ?x3))) -;; (not (Rf ?x1 ?x3 ?x2)) (((Rf ?x1 ?x3 ?x2))) ) -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((not (Rf ?x0 ?x3 ?x2))(Rf ?x1 ?x3 ?x2)) -;; (not (Rf ?x0 ?x1 ?x2)) (((Rf ?x0 ?x1 ?x2))) ) -;; ;; transitive2 extended -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x0 ?x1 ?x2)(not (Rf ?x0 ?x3 ?x2))) -;; (not (Rf ?x1 ?x3 ?x2)) (((Rf ?x1 ?x3 ?x2))) ) - -;; ;;transitive3 -(assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () ((Rf ?x0 ?x1 ?x2)(Rf ?x0 ?x3 ?x1)) - (and (Rf ?x0 ?x3 ?x2) (Rf ?x3 ?x1 ?x2)) () ) - -;; (assert-propagation ((?x0 elt)(?x1 elt)(?x2 elt)(?x3 elt)) () () -;; (=> (and (Rf ?x0 ?x1 ?x2)(Rf ?x0 ?x3 ?x1)) -;; (and (Rf ?x0 ?x3 ?x2) (Rf ?x3 ?x1 ?x2))) (((Rf ?x0 ?x1 ?x2)(Rf ?x0 ?x3 ?x1))) ) - - -(declare-fun e1 () elt) -(declare-fun e2 () elt) -(declare-fun e3 () elt) -(declare-fun e4 () elt) - - -;;Example0 -;;(assert (not (=> (and (not (= e1 e2)) (Rf e1 e2 e3)) (Rf e1 (f e1) e3))) ) - -;;Thomas' example1 x,e1 y,e2 z,e3 y',e4 -;;(assert (not (=> (and (Rf e1 e2 e3) (not (= e2 e3)) (= e4 (f e2))) (Rf e1 e4 e3)))) - -(declare-fun Rf_avoid (elt elt elt) Bool) - -;; (assert-rewrite ((?x0 elt)(?x1 elt)(?exc elt)) () (Rf_avoid ?x0 ?x1 ?exc) -;; (or (Rf ?x0 ?x1 ?exc) (and (Rf ?x0 ?x1 ?x1) (not (Rf ?x0 ?exc ?exc)))) () ) - -(declare-fun null () elt) -(assert (= (f null) null)) - -(declare-fun join (elt elt) elt) - -;; (assert-propagation ((?x elt)(?y elt)(?z elt)) () ((Rf ?x ?z ?z)(Rf ?y ?z ?z)) (Rf ?x (join ?x ?y) ?z) (((join ?x ?y))) ) -;; (assert-propagation ((?x elt)(?y elt)) () () (or (and (Rf ?x (join ?x ?y) (join ?x ?y)) (Rf ?y (join ?x ?y) (join ?x ?y))) (= (join ?x ?y) null)) (((join ?x ?y))) ) - -;;Thomas' example2 -;; (assert (not (=> (and (Rf e1 null null) (= (join e1 e2) null) -;; ;; (next' == upd(next, e, e1) -;; ) -;; ;; (reach(next', e1, null) ) -;; (or (and (Rf e1 null null) (Rf_avoid e1 null e2) ) -;; (and (not (= e2 null)) (Rf_avoid e1 e2 null) (Rf e1 null e2) (Rf_avoid e1 null e2) ) -;; (and (not (= e2 null)) (Rf_avoid e1 e2 null) (Rf e1 null null) (Rf_avoid e1 null e2) ) ) -;; ))) - - -;;Thomas' example3 -;; join(next, first, e) == null && -;; reach(next, e, null) && -;; e != null && -;; next' == upd(next, e, first) && -;; first' == e && -;; e' == sel (next, e) -;; ==> -;; join(next', first', e') == null - - -;;Thomas' example3 -(assert(not - (=> - (and - ;; (= (join e1 e2) null) - (Rf e2 null null) - (not (= e2 null))) - ;; (next' == upd(next, e2, e1) - ;;join(next',e1,e2) == null -(or (and (not (Rf (f e2) e2 e2)) (not (Rf e1 e2 e2) )) -;; (and (Rf (f e2) e2 e2) (not (Rf e1 e1 e1) )) - (and (Rf e1 e2 e2) (not (Rf (f e2) e1 e1)) ) -) -;; (or -;; (and (not (Rf e1 e2 e2)) (not (Rf e2 e2 e2))) -;; (and (Rf e1 e2 e2) (not (Rf e2 e1 e1))) -;; (and (Rf e2 e2 e2) (not (Rf e1 e1 e1))) -;; ) -))) - - - -;; ;;Thomas' example wrong sat? -;; (assert (not (=> (and -;; (= (join e1 e2) null) -;; (Rf e2 null null) (not (= e2 null))) -;; ;; (next' == upd(next, e2, e1) -;; ;;join(next',e1,e2) == null -;; (not (Rf e2 e2 e2)) -;; ;; (or -;; ;; (and (not (Rf e1 e2 e2)) (not (Rf e2 e2 e2))) -;; ;; (and (Rf e1 e2 e2) (not (Rf e2 e1 e1))) -;; ;; (and (Rf e2 e2 e2) (not (Rf e1 e1 e1))) -;; ;; ) -;; ))) - -;; ;;example4 -;; (assert (not (=> (and -;; (= (join e1 e2) null) -;; (Rf e2 null null) (not (= e2 null)) -;; ) -;; (not (Rf e2 e2 e2)) -;; ))) - - -;; ;;example5 -;; (assert (and -;; ;; (= (join e1 e2) null) -;; (= (f (f e1)) e1) -;; (Rf e1 e2 e2) -;; (not (= e2 e1)) -;; (not (= e2 (f e1))) -;; ) -;; ) - - - - -(check-sat) -(exit) - diff --git a/test/regress/regress0/rewriterules/test_efficient_ematching.smt2 b/test/regress/regress0/rewriterules/test_efficient_ematching.smt2 deleted file mode 100644 index e91ef36c2..000000000 --- a/test/regress/regress0/rewriterules/test_efficient_ematching.smt2 +++ /dev/null @@ -1,35 +0,0 @@ -(set-logic AUFLIA) -(set-info :status unsat) - -;; don't use a datatypes for currently focusing in uf -(declare-sort elt 0) - -(declare-fun R (elt elt) Bool) - -;; reflexive -(assert-rewrite ((x elt)) () (R x x) true ()) - -;; transitive -(assert-propagation ((x elt) (y elt) (z elt)) () ((R x y) (R y z)) (R x z) ()) - -;; anti-symmetric -(assert-propagation ((x elt) (y elt)) () ((R x y) (R y x)) (= x y) ()) - -(declare-fun f (elt) elt) -(assert-propagation ((x elt)(y elt)) () ((R (f x) (f y))) (R x y) ()) - - -(declare-fun e1 () elt) -(declare-fun e2 () elt) -(declare-fun e3 () elt) -(declare-fun e4 () elt) -(declare-fun e5 () elt) - -(assert (not (=> (and (R e1 e2) (R e3 (f e4)) (R e4 e5) - (or (and (= e3 (f e2)) (= e4 e1)) - (and (= e4 e2) (= e5 e1)) ) - ) (= e1 e2)))) - -(check-sat) - -(exit) \ No newline at end of file diff --git a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness2_rr.smt2 b/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness2_rr.smt2 deleted file mode 100644 index 686b9ff04..000000000 --- a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness2_rr.smt2 +++ /dev/null @@ -1,508 +0,0 @@ -;;; From a verification condition generated by why3. The original program -;; can be found at http://toccata.lri.fr/gallery/vstte10_max_sum.en.html . -;; The problem has been modified by doubling the size of the arrays -;; (* **) -;; VSTTE'10 competition http://www.macs.hw.ac.uk/vstte10/Competition.html **) -;; Problem 1: maximum /\ sum of an array **) - -;; Author: Jean-Christophe Filliatre (CNRS) **) -;; Tool: Why3 (see http://why3.lri.fr/) **) -;; *\) **) - -;; Particularly the assertion in the test case that the sum s = 90 - -;; Added rewriterules: - -;; (assert-propagation ((c (Array Int Int)) (i Int) (j Int)) ((>= i j)) -;; () (= (sum c i j) 0) (((sum c i j)))) - -;; (assert-propagation ((c (Array Int Int)) (i Int) (j Int)) ((< i j)) -;; () (= (sum c i j) (+ (sum c i (- j 1)) (select c (- j 1)))) (((sum c i j)))) - - - -;;; this is a prelude for CVC4 -(set-logic AUFNIRA) -;;; this is a prelude for CVC4 integer arithmetic -(declare-sort uni 0) - -(declare-sort deco 0) - -(declare-sort ty 0) - -(declare-fun sort (ty uni) deco) - -(declare-fun int () ty) - -(declare-fun real () ty) - -(declare-fun bool () ty) - -(declare-fun True () uni) - -(declare-fun False () uni) - -(declare-fun match_bool (deco deco deco) uni) - -;; match_bool_True - (assert - (forall ((a ty)) - (forall ((z uni) (z1 uni)) - (= (sort a (match_bool (sort bool True) (sort a z) (sort a z1))) (sort a z))))) - -;; match_bool_False - (assert - (forall ((a ty)) - (forall ((z uni) (z1 uni)) - (= (sort a (match_bool (sort bool False) (sort a z) (sort a z1))) (sort a - z1))))) - -(declare-fun index_bool (deco) Int) - -;; index_bool_True - (assert (= (index_bool (sort bool True)) 0)) - -;; index_bool_False - (assert (= (index_bool (sort bool False)) 1)) - -;; bool_inversion - (assert - (forall ((u uni)) - (or (= (sort bool u) (sort bool True)) (= (sort bool u) (sort bool False))))) - -(declare-fun tuple0 () ty) - -(declare-fun Tuple0 () uni) - -;; tuple0_inversion - (assert (forall ((u uni)) (= (sort tuple0 u) (sort tuple0 Tuple0)))) - -;; CompatOrderMult - (assert - (forall ((x Int) (y Int) (z Int)) - (=> (<= x y) (=> (<= 0 z) (<= (* x z) (* y z)))))) - -(declare-fun ref (ty) ty) - -(declare-fun mk_ref (deco) uni) - -(declare-fun contents (deco) uni) - -;; contents_def - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort a (contents (sort (ref a) (mk_ref (sort a u))))) (sort a u))))) - -;; ref_inversion - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort (ref a) u) (sort (ref a) - (mk_ref (sort a (contents (sort (ref a) u))))))))) - -(declare-fun map (ty ty) ty) - -(declare-fun get (deco deco) uni) - -(declare-fun set (deco deco deco) uni) - -;; Select_eq - (assert - (forall ((m (Array Int Int))) - (forall ((a1 Int) (a2 Int)) - (forall ((b Int)) - (! (=> (= a1 a2) (= (select (store m a1 b) a2) b)) :pattern ((select (store m a1 b) a2)) ))))) - -;; Select_eq - (assert - (forall ((a ty) (b ty)) - (forall ((m uni)) - (forall ((a1 uni) (a2 uni)) - (forall ((b1 uni)) - (! (=> (= (sort a a1) (sort a a2)) - (= (sort b - (get - (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2))) (sort b b1))) :pattern ((sort b - (get - (sort (map a b) - (set (sort (map a b) m) - (sort a a1) (sort b b1))) - (sort a a2)))) )))))) - -;; Select_neq - (assert - (forall ((m (Array Int Int))) - (forall ((a1 Int) (a2 Int)) - (forall ((b Int)) - (! (=> (not (= a1 a2)) (= (select (store m a1 b) a2) (select m a2))) :pattern ((select (store m a1 b) a2)) ))))) - -;; Select_neq - (assert - (forall ((a ty) (b ty)) - (forall ((m uni)) - (forall ((a1 uni) (a2 uni)) - (forall ((b1 uni)) - (! (=> (not (= (sort a a1) (sort a a2))) - (= (sort b - (get - (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2))) (sort b (get (sort (map a b) m) (sort a a2))))) :pattern ( - (sort b - (get (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2)))) )))))) - -(declare-fun const1 (deco) uni) - -(declare-fun const2 (Int) (Array Int Int)) - -;; Const - (assert (forall ((b Int) (a Int)) (= (select (const2 b) a) b))) - -;; Const - (assert - (forall ((a ty) (b ty)) - (forall ((b1 uni) (a1 uni)) - (= (sort b (get (sort (map a b) (const1 (sort b b1))) (sort a a1))) - (sort b b1))))) - -(declare-sort array 1) - -(declare-fun array1 (ty) ty) - -(declare-fun mk_array (Int deco) uni) - -(declare-fun mk_array1 (Int (Array Int Int)) (array Int)) - -(declare-fun length (deco) Int) - -(declare-fun t2tb ((array Int)) uni) - -(declare-fun tb2t (deco) (array Int)) - -;; BridgeL - (assert - (forall ((i (array Int))) - (! (= (tb2t (sort (array1 int) (t2tb i))) i) :pattern ((sort (array1 int) - (t2tb i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort (array1 int) (t2tb (tb2t (sort (array1 int) j)))) (sort - (array1 int) - j)) :pattern ( - (sort (array1 int) (t2tb (tb2t (sort (array1 int) j))))) ))) - -;; length_def - (assert - (forall ((u Int) (u1 (Array Int Int))) - (= (length (sort (array1 int) (t2tb (mk_array1 u u1)))) u))) - -;; length_def - (assert - (forall ((a ty)) - (forall ((u Int) (u1 uni)) - (= (length (sort (array1 a) (mk_array u (sort (map int a) u1)))) u)))) - -(declare-fun elts (deco) uni) - -(declare-fun t2tb1 ((Array Int Int)) uni) - -(declare-fun tb2t1 (deco) (Array Int Int)) - -;; BridgeL - (assert - (forall ((i (Array Int Int))) - (! (= (tb2t1 (sort (map int int) (t2tb1 i))) i) :pattern ((sort - (map int int) - (t2tb1 i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort (map int int) (t2tb1 (tb2t1 (sort (map int int) j)))) (sort - (map - int - int) j)) :pattern ( - (sort (map int int) (t2tb1 (tb2t1 (sort (map int int) j))))) ))) - -;; elts_def - (assert - (forall ((u Int) (u1 (Array Int Int))) - (= (tb2t1 - (sort (map int int) (elts (sort (array1 int) (t2tb (mk_array1 u u1)))))) u1))) - -;; elts_def - (assert - (forall ((a ty)) - (forall ((u Int) (u1 uni)) - (= (sort (map int a) - (elts (sort (array1 a) (mk_array u (sort (map int a) u1))))) (sort - (map int a) - u1))))) - -;; array_inversion - (assert - (forall ((u (array Int))) - (= u (mk_array1 (length (sort (array1 int) (t2tb u))) - (tb2t1 (sort (map int int) (elts (sort (array1 int) (t2tb u))))))))) - -;; array_inversion - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort (array1 a) u) (sort (array1 a) - (mk_array (length (sort (array1 a) u)) - (sort (map int a) (elts (sort (array1 a) u))))))))) - -(declare-fun get1 (deco Int) uni) - -(declare-fun t2tb2 (Int) uni) - -(declare-fun tb2t2 (deco) Int) - -;; BridgeL - (assert - (forall ((i Int)) - (! (= (tb2t2 (sort int (t2tb2 i))) i) :pattern ((sort int (t2tb2 i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort int (t2tb2 (tb2t2 (sort int j)))) (sort int j)) :pattern ( - (sort int (t2tb2 (tb2t2 (sort int j))))) ))) - -;; get_def - (assert - (forall ((a (array Int)) (i Int)) - (= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) i))) (select - (tb2t1 (sort (map int int) (elts (sort (array1 int) (t2tb a))))) i)))) - -;; get_def - (assert - (forall ((a ty)) - (forall ((a1 uni) (i Int)) - (= (sort a (get1 (sort (array1 a) a1) i)) (sort a - (get - (sort (map int a) - (elts (sort (array1 a) a1))) - (sort int (t2tb2 i)))))))) - -(declare-fun set1 (deco Int deco) uni) - -;; set_def - (assert - (forall ((a (array Int)) (i Int) (v Int)) - (= (tb2t - (sort (array1 int) - (set1 (sort (array1 int) (t2tb a)) i (sort int (t2tb2 v))))) (mk_array1 - (length - (sort - (array1 - int) - (t2tb a))) - (store - (tb2t1 - (sort - (map - int - int) - (elts - (sort - (array1 - int) - (t2tb a))))) i v))))) - -;; set_def - (assert - (forall ((a ty)) - (forall ((a1 uni) (i Int) (v uni)) - (= (sort (array1 a) (set1 (sort (array1 a) a1) i (sort a v))) (sort - (array1 a) - (mk_array - (length - (sort - (array1 a) - a1)) - (sort - (map int a) - (set - (sort - (map int a) - (elts - (sort - (array1 a) - a1))) - (sort - int - (t2tb2 i)) - (sort a v))))))))) - -(declare-fun make (Int deco) uni) - -;; make_def - (assert - (forall ((n Int) (v Int)) - (= (tb2t (sort (array1 int) (make n (sort int (t2tb2 v))))) (mk_array1 n - (const2 v))))) - -;; make_def - (assert - (forall ((a ty)) - (forall ((n Int) (v uni)) - (= (sort (array1 a) (make n (sort a v))) (sort (array1 a) - (mk_array n - (sort (map int a) - (const1 (sort a v))))))))) - -(declare-fun sum ((Array Int Int) Int Int) Int) - -;; Sum_def_empty - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (<= j i) (= (sum c i j) 0)))) - -;; Sum_def_non_empty - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (< i j) (= (sum c i j) (+ (select c i) (sum c (+ i 1) j)))))) - -;; Sum_right_extension - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (< i j) (= (sum c i j) (+ (sum c i (- j 1)) (select c (- j 1))))))) - -;; Sum_transitivity - (assert - (forall ((c (Array Int Int)) (i Int) (k Int) (j Int)) - (=> (and (<= i k) (<= k j)) (= (sum c i j) (+ (sum c i k) (sum c k j)))))) - -;; Sum_eq - (assert - (forall ((c1 (Array Int Int)) (c2 (Array Int Int)) (i Int) (j Int)) - (=> - (forall ((k Int)) - (=> (and (<= i k) (< k j)) (= (select c1 k) (select c2 k)))) - (= (sum c1 i j) (sum c2 i j))))) - - (assert-propagation ((c (Array Int Int)) (i Int) (j Int)) ((>= i j)) - () (= (sum c i j) 0) (((sum c i j)))) - - (assert-propagation ((c (Array Int Int)) (i Int) (j Int)) ((< i j)) - () (= (sum c i j) (+ (sum c i (- j 1)) (select c (- j 1)))) (((sum c i j)))) - -(declare-fun sum1 ((array Int) Int Int) Int) - -;; sum_def - (assert - (forall ((a (array Int)) (l Int) (h Int)) - (= (sum1 a l h) (sum - (tb2t1 - (sort (map int int) (elts (sort (array1 int) (t2tb a))))) l - h)))) - -(declare-fun is_max ((array Int) Int Int Int) Bool) - -;; is_max_def - (assert - (forall ((a (array Int)) (l Int) (h Int) (m Int)) - (and - (=> (is_max a l h m) - (and - (forall ((k Int)) - (=> (and (<= l k) (< k h)) - (<= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))) m))) - (or (and (<= h l) (= m 0)) - (and (< l h) - (exists ((k Int)) - (and (and (<= l k) (< k h)) - (= m (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k)))))))))) - (=> - (and - (forall ((k Int)) - (=> (and (<= l k) (< k h)) - (<= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))) m))) - (or (and (<= h l) (= m 0)) - (and (< l h) - (exists ((k Int)) - (and (and (<= l k) (< k h)) - (= m (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))))))))) (is_max - a l h m))))) - -(assert -;; WP_parameter_test_case - ;; File "vstte10_max_sum/../vstte10_max_sum.mlw", line 63, characters 6-15 - (not - (=> (<= 0 20) - (=> (and (<= 0 0) (< 0 20)) - (forall ((a (Array Int Int))) - (=> (= a (store (const2 0) 0 9)) - (=> (and (<= 0 1) (< 1 20)) - (forall ((a1 (Array Int Int))) - (=> (= a1 (store a 1 5)) - (=> (and (<= 0 2) (< 2 20)) - (forall ((a2 (Array Int Int))) - (=> (= a2 (store a1 2 0)) - (=> (and (<= 0 3) (< 3 20)) - (forall ((a3 (Array Int Int))) - (=> (= a3 (store a2 3 2)) - (=> (and (<= 0 4) (< 4 20)) - (forall ((a4 (Array Int Int))) - (=> (= a4 (store a3 4 7)) - (=> (and (<= 0 5) (< 5 20)) - (forall ((a5 (Array Int Int))) - (=> (= a5 (store a4 5 3)) - (=> (and (<= 0 6) (< 6 20)) - (forall ((a6 (Array Int Int))) - (=> (= a6 (store a5 6 2)) - (=> (and (<= 0 7) (< 7 20)) - (forall ((a7 (Array Int Int))) - (=> (= a7 (store a6 7 1)) - (=> (and (<= 0 8) (< 8 20)) - (forall ((a8 (Array Int Int))) - (=> (= a8 (store a7 8 10)) - (=> (and (<= 0 9) (< 9 20)) - (forall ((a9 (Array Int Int))) - (=> (= a9 (store a8 9 6)) - (=> (and (<= 0 10) (< 10 20)) - (forall ((a10 (Array Int Int))) - (=> (= a10 (store a9 10 9)) - (=> (and (<= 0 11) (< 11 20)) - (forall ((a11 (Array Int Int))) - (=> (= a11 (store a10 11 5)) - (=> (and (<= 0 12) (< 12 20)) - (forall ((a12 (Array Int Int))) - (=> (= a12 (store a11 12 0)) - (=> (and (<= 0 13) (< 13 20)) - (forall ((a13 (Array Int Int))) - (=> (= a13 (store a12 13 2)) - (=> (and (<= 0 14) (< 14 20)) - (forall ((a14 (Array Int Int))) - (=> (= a14 (store a13 14 7)) - (=> (and (<= 0 15) (< 15 20)) - (forall ((a15 (Array Int Int))) - (=> (= a15 (store a14 15 3)) - (=> (and (<= 0 16) (< 16 20)) - (forall ((a16 (Array Int Int))) - (=> (= a16 (store a15 16 2)) - (=> (and (<= 0 17) (< 17 20)) - (forall ((a17 (Array Int Int))) - (=> (= a17 (store a16 17 1)) - (=> (and (<= 0 18) (< 18 20)) - (forall ((a18 (Array Int Int))) - (=> (= a18 (store a17 18 10)) - (=> (and (<= 0 19) (< 19 20)) - (forall ((a19 (Array Int Int))) - (=> (= a19 (store a18 19 6)) - (=> - (and (<= 0 20) - (forall ((i Int)) (=> (and (<= 0 i) (< i 20)) (<= 0 (select a19 i))))) - (forall ((result Int) (result1 Int)) - (=> - (and (= result (sum a19 0 20)) - (and (is_max (mk_array1 20 a19) 0 20 result1) (<= result (* 20 result1)))) - (= result 90))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) -(check-sat) - diff --git a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3.smt2 b/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3.smt2 deleted file mode 100644 index e468128ac..000000000 --- a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3.smt2 +++ /dev/null @@ -1,492 +0,0 @@ -;;; From a verification condition generated by why3. The original program -;; can be found at http://toccata.lri.fr/gallery/vstte10_max_sum.en.html . -;; The problem has been modified by doubling the size of the arrays -;; (* **) -;; VSTTE'10 competition http://www.macs.hw.ac.uk/vstte10/Competition.html **) -;; Problem 1: maximum /\ sum of an array **) - -;; Author: Jean-Christophe Filliatre (CNRS) **) -;; Tool: Why3 (see http://why3.lri.fr/) **) -;; *\) **) - -;; Particularly the assertion in the test case that the max m = 10 - -;;; this is a prelude for CVC4 -(set-logic AUFNIRA) -;;; this is a prelude for CVC4 integer arithmetic -(declare-sort uni 0) - -(declare-sort deco 0) - -(declare-sort ty 0) - -(declare-fun sort (ty uni) deco) - -(declare-fun int () ty) - -(declare-fun real () ty) - -(declare-fun bool () ty) - -(declare-fun True () uni) - -(declare-fun False () uni) - -(declare-fun match_bool (deco deco deco) uni) - -;; match_bool_True - (assert - (forall ((a ty)) - (forall ((z uni) (z1 uni)) - (= (sort a (match_bool (sort bool True) (sort a z) (sort a z1))) (sort a z))))) - -;; match_bool_False - (assert - (forall ((a ty)) - (forall ((z uni) (z1 uni)) - (= (sort a (match_bool (sort bool False) (sort a z) (sort a z1))) (sort a - z1))))) - -(declare-fun index_bool (deco) Int) - -;; index_bool_True - (assert (= (index_bool (sort bool True)) 0)) - -;; index_bool_False - (assert (= (index_bool (sort bool False)) 1)) - -;; bool_inversion - (assert - (forall ((u uni)) - (or (= (sort bool u) (sort bool True)) (= (sort bool u) (sort bool False))))) - -(declare-fun tuple0 () ty) - -(declare-fun Tuple0 () uni) - -;; tuple0_inversion - (assert (forall ((u uni)) (= (sort tuple0 u) (sort tuple0 Tuple0)))) - -;; CompatOrderMult - (assert - (forall ((x Int) (y Int) (z Int)) - (=> (<= x y) (=> (<= 0 z) (<= (* x z) (* y z)))))) - -(declare-fun ref (ty) ty) - -(declare-fun mk_ref (deco) uni) - -(declare-fun contents (deco) uni) - -;; contents_def - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort a (contents (sort (ref a) (mk_ref (sort a u))))) (sort a u))))) - -;; ref_inversion - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort (ref a) u) (sort (ref a) - (mk_ref (sort a (contents (sort (ref a) u))))))))) - -(declare-fun map (ty ty) ty) - -(declare-fun get (deco deco) uni) - -(declare-fun set (deco deco deco) uni) - -;; Select_eq - (assert - (forall ((m (Array Int Int))) - (forall ((a1 Int) (a2 Int)) - (forall ((b Int)) - (! (=> (= a1 a2) (= (select (store m a1 b) a2) b)) :pattern ((select (store m a1 b) a2)) ))))) - -;; Select_eq - (assert - (forall ((a ty) (b ty)) - (forall ((m uni)) - (forall ((a1 uni) (a2 uni)) - (forall ((b1 uni)) - (! (=> (= (sort a a1) (sort a a2)) - (= (sort b - (get - (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2))) (sort b b1))) :pattern ((sort b - (get - (sort (map a b) - (set (sort (map a b) m) - (sort a a1) (sort b b1))) - (sort a a2)))) )))))) - -;; Select_neq - (assert - (forall ((m (Array Int Int))) - (forall ((a1 Int) (a2 Int)) - (forall ((b Int)) - (! (=> (not (= a1 a2)) (= (select (store m a1 b) a2) (select m a2))) :pattern ((select (store m a1 b) a2)) ))))) - -;; Select_neq - (assert - (forall ((a ty) (b ty)) - (forall ((m uni)) - (forall ((a1 uni) (a2 uni)) - (forall ((b1 uni)) - (! (=> (not (= (sort a a1) (sort a a2))) - (= (sort b - (get - (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2))) (sort b (get (sort (map a b) m) (sort a a2))))) :pattern ( - (sort b - (get (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2)))) )))))) - -(declare-fun const1 (deco) uni) - -(declare-fun const2 (Int) (Array Int Int)) - -;; Const - (assert (forall ((b Int) (a Int)) (= (select (const2 b) a) b))) - -;; Const - (assert - (forall ((a ty) (b ty)) - (forall ((b1 uni) (a1 uni)) - (= (sort b (get (sort (map a b) (const1 (sort b b1))) (sort a a1))) - (sort b b1))))) - -(declare-sort array 1) - -(declare-fun array1 (ty) ty) - -(declare-fun mk_array (Int deco) uni) - -(declare-fun mk_array1 (Int (Array Int Int)) (array Int)) - -(declare-fun length (deco) Int) - -(declare-fun t2tb ((array Int)) uni) - -(declare-fun tb2t (deco) (array Int)) - -;; BridgeL - (assert - (forall ((i (array Int))) - (! (= (tb2t (sort (array1 int) (t2tb i))) i) :pattern ((sort (array1 int) - (t2tb i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort (array1 int) (t2tb (tb2t (sort (array1 int) j)))) (sort - (array1 int) - j)) :pattern ( - (sort (array1 int) (t2tb (tb2t (sort (array1 int) j))))) ))) - -;; length_def - (assert - (forall ((u Int) (u1 (Array Int Int))) - (= (length (sort (array1 int) (t2tb (mk_array1 u u1)))) u))) - -;; length_def - (assert - (forall ((a ty)) - (forall ((u Int) (u1 uni)) - (= (length (sort (array1 a) (mk_array u (sort (map int a) u1)))) u)))) - -(declare-fun elts (deco) uni) - -(declare-fun t2tb1 ((Array Int Int)) uni) - -(declare-fun tb2t1 (deco) (Array Int Int)) - -;; BridgeL - (assert - (forall ((i (Array Int Int))) - (! (= (tb2t1 (sort (map int int) (t2tb1 i))) i) :pattern ((sort - (map int int) - (t2tb1 i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort (map int int) (t2tb1 (tb2t1 (sort (map int int) j)))) (sort - (map - int - int) j)) :pattern ( - (sort (map int int) (t2tb1 (tb2t1 (sort (map int int) j))))) ))) - -;; elts_def - (assert - (forall ((u Int) (u1 (Array Int Int))) - (= (tb2t1 - (sort (map int int) (elts (sort (array1 int) (t2tb (mk_array1 u u1)))))) u1))) - -;; elts_def - (assert - (forall ((a ty)) - (forall ((u Int) (u1 uni)) - (= (sort (map int a) - (elts (sort (array1 a) (mk_array u (sort (map int a) u1))))) (sort - (map int a) - u1))))) - -;; array_inversion - (assert - (forall ((u (array Int))) - (= u (mk_array1 (length (sort (array1 int) (t2tb u))) - (tb2t1 (sort (map int int) (elts (sort (array1 int) (t2tb u))))))))) - -;; array_inversion - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort (array1 a) u) (sort (array1 a) - (mk_array (length (sort (array1 a) u)) - (sort (map int a) (elts (sort (array1 a) u))))))))) - -(declare-fun get1 (deco Int) uni) - -(declare-fun t2tb2 (Int) uni) - -(declare-fun tb2t2 (deco) Int) - -;; BridgeL - (assert - (forall ((i Int)) - (! (= (tb2t2 (sort int (t2tb2 i))) i) :pattern ((sort int (t2tb2 i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort int (t2tb2 (tb2t2 (sort int j)))) (sort int j)) :pattern ( - (sort int (t2tb2 (tb2t2 (sort int j))))) ))) - -;; get_def - (assert - (forall ((a (array Int)) (i Int)) - (= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) i))) (select - (tb2t1 (sort (map int int) (elts (sort (array1 int) (t2tb a))))) i)))) - -;; get_def - (assert - (forall ((a ty)) - (forall ((a1 uni) (i Int)) - (= (sort a (get1 (sort (array1 a) a1) i)) (sort a - (get - (sort (map int a) - (elts (sort (array1 a) a1))) - (sort int (t2tb2 i)))))))) - -(declare-fun set1 (deco Int deco) uni) - -;; set_def - (assert - (forall ((a (array Int)) (i Int) (v Int)) - (= (tb2t - (sort (array1 int) - (set1 (sort (array1 int) (t2tb a)) i (sort int (t2tb2 v))))) (mk_array1 - (length - (sort - (array1 - int) - (t2tb a))) - (store - (tb2t1 - (sort - (map - int - int) - (elts - (sort - (array1 - int) - (t2tb a))))) i v))))) - -;; set_def - (assert - (forall ((a ty)) - (forall ((a1 uni) (i Int) (v uni)) - (= (sort (array1 a) (set1 (sort (array1 a) a1) i (sort a v))) (sort - (array1 a) - (mk_array - (length - (sort - (array1 a) - a1)) - (sort - (map int a) - (set - (sort - (map int a) - (elts - (sort - (array1 a) - a1))) - (sort - int - (t2tb2 i)) - (sort a v))))))))) - -(declare-fun make (Int deco) uni) - -;; make_def - (assert - (forall ((n Int) (v Int)) - (= (tb2t (sort (array1 int) (make n (sort int (t2tb2 v))))) (mk_array1 n - (const2 v))))) - -;; make_def - (assert - (forall ((a ty)) - (forall ((n Int) (v uni)) - (= (sort (array1 a) (make n (sort a v))) (sort (array1 a) - (mk_array n - (sort (map int a) - (const1 (sort a v))))))))) - -(declare-fun sum ((Array Int Int) Int Int) Int) - -;; Sum_def_empty - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (<= j i) (= (sum c i j) 0)))) - -;; Sum_def_non_empty - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (< i j) (= (sum c i j) (+ (select c i) (sum c (+ i 1) j)))))) - -;; Sum_right_extension - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (< i j) (= (sum c i j) (+ (sum c i (- j 1)) (select c (- j 1))))))) - -;; Sum_transitivity - (assert - (forall ((c (Array Int Int)) (i Int) (k Int) (j Int)) - (=> (and (<= i k) (<= k j)) (= (sum c i j) (+ (sum c i k) (sum c k j)))))) - -;; Sum_eq - (assert - (forall ((c1 (Array Int Int)) (c2 (Array Int Int)) (i Int) (j Int)) - (=> - (forall ((k Int)) - (=> (and (<= i k) (< k j)) (= (select c1 k) (select c2 k)))) - (= (sum c1 i j) (sum c2 i j))))) - -(declare-fun sum1 ((array Int) Int Int) Int) - -;; sum_def - (assert - (forall ((a (array Int)) (l Int) (h Int)) - (= (sum1 a l h) (sum - (tb2t1 - (sort (map int int) (elts (sort (array1 int) (t2tb a))))) l - h)))) - -(declare-fun is_max ((array Int) Int Int Int) Bool) - -;; is_max_def - (assert - (forall ((a (array Int)) (l Int) (h Int) (m Int)) - (and - (=> (is_max a l h m) - (and - (forall ((k Int)) - (=> (and (<= l k) (< k h)) - (<= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))) m))) - (or (and (<= h l) (= m 0)) - (and (< l h) - (exists ((k Int)) - (and (and (<= l k) (< k h)) - (= m (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k)))))))))) - (=> - (and - (forall ((k Int)) - (=> (and (<= l k) (< k h)) - (<= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))) m))) - (or (and (<= h l) (= m 0)) - (and (< l h) - (exists ((k Int)) - (and (and (<= l k) (< k h)) - (= m (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))))))))) (is_max - a l h m))))) - -(assert -;; WP_parameter_test_case - ;; File "vstte10_max_sum/../vstte10_max_sum.mlw", line 63, characters 6-15 - (not - (=> (<= 0 20) - (=> (and (<= 0 0) (< 0 20)) - (forall ((a (Array Int Int))) - (=> (= a (store (const2 0) 0 9)) - (=> (and (<= 0 1) (< 1 20)) - (forall ((a1 (Array Int Int))) - (=> (= a1 (store a 1 5)) - (=> (and (<= 0 2) (< 2 20)) - (forall ((a2 (Array Int Int))) - (=> (= a2 (store a1 2 0)) - (=> (and (<= 0 3) (< 3 20)) - (forall ((a3 (Array Int Int))) - (=> (= a3 (store a2 3 2)) - (=> (and (<= 0 4) (< 4 20)) - (forall ((a4 (Array Int Int))) - (=> (= a4 (store a3 4 7)) - (=> (and (<= 0 5) (< 5 20)) - (forall ((a5 (Array Int Int))) - (=> (= a5 (store a4 5 3)) - (=> (and (<= 0 6) (< 6 20)) - (forall ((a6 (Array Int Int))) - (=> (= a6 (store a5 6 2)) - (=> (and (<= 0 7) (< 7 20)) - (forall ((a7 (Array Int Int))) - (=> (= a7 (store a6 7 1)) - (=> (and (<= 0 8) (< 8 20)) - (forall ((a8 (Array Int Int))) - (=> (= a8 (store a7 8 10)) - (=> (and (<= 0 9) (< 9 20)) - (forall ((a9 (Array Int Int))) - (=> (= a9 (store a8 9 6)) - (=> (and (<= 0 10) (< 10 20)) - (forall ((a10 (Array Int Int))) - (=> (= a10 (store a9 10 9)) - (=> (and (<= 0 11) (< 11 20)) - (forall ((a11 (Array Int Int))) - (=> (= a11 (store a10 11 5)) - (=> (and (<= 0 12) (< 12 20)) - (forall ((a12 (Array Int Int))) - (=> (= a12 (store a11 12 0)) - (=> (and (<= 0 13) (< 13 20)) - (forall ((a13 (Array Int Int))) - (=> (= a13 (store a12 13 2)) - (=> (and (<= 0 14) (< 14 20)) - (forall ((a14 (Array Int Int))) - (=> (= a14 (store a13 14 7)) - (=> (and (<= 0 15) (< 15 20)) - (forall ((a15 (Array Int Int))) - (=> (= a15 (store a14 15 3)) - (=> (and (<= 0 16) (< 16 20)) - (forall ((a16 (Array Int Int))) - (=> (= a16 (store a15 16 2)) - (=> (and (<= 0 17) (< 17 20)) - (forall ((a17 (Array Int Int))) - (=> (= a17 (store a16 17 1)) - (=> (and (<= 0 18) (< 18 20)) - (forall ((a18 (Array Int Int))) - (=> (= a18 (store a17 18 10)) - (=> (and (<= 0 19) (< 19 20)) - (forall ((a19 (Array Int Int))) - (=> (= a19 (store a18 19 6)) - (=> - (and (<= 0 20) - (forall ((i Int)) (=> (and (<= 0 i) (< i 20)) (<= 0 (select a19 i))))) - (forall ((result Int) (result1 Int)) - (=> - (and (= result (sum a19 0 20)) - (and (is_max (mk_array1 20 a19) 0 20 result1) (<= result (* 20 result1)))) - (=> (= result 90) (= result1 10)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) -(check-sat) - diff --git a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3_rr.smt2 b/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3_rr.smt2 deleted file mode 100644 index a6f4106e5..000000000 --- a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness3_rr.smt2 +++ /dev/null @@ -1,520 +0,0 @@ -;;; From a verification condition generated by why3. The original program -;; can be found at http://toccata.lri.fr/gallery/vstte10_max_sum.en.html . -;; The problem has been modified by doubling the size of the arrays. -;; (* **) -;; VSTTE'10 competition http://www.macs.hw.ac.uk/vstte10/Competition.html **) -;; Problem 1: maximum /\ sum of an array **) - -;; Author: Jean-Christophe Filliatre (CNRS) **) -;; Tool: Why3 (see http://why3.lri.fr/) **) -;; *\) **) - -;; Particularly the assertion in the test case that the max m = 10 - -;; Added rewriterules: -;; (assert-propagation ((c (array Int)) (l Int) (h Int) (m Int)) () -;; ((is_max c l h m)) (= m (comp_max c l h)) ()) - -;; (assert-rewrite ((c (array Int)) (l Int) (h Int)) ((<= h l)) -;; (comp_max c l h) 0 ()) - -;; (assert-rewrite ((c (array Int)) (l Int) (h Int)) ((< l h)(< (comp_max c l (- h 1)) (tb2t2 (sort int (get1 (sort (array1 int) (t2tb c)) h)))) ) -;; (comp_max c l h) (tb2t2 (sort int (get1 (sort (array1 int) (t2tb c)) h))) ()) - -;; (assert-rewrite ((c (array Int)) (l Int) (h Int)) ((< l h)(>= (comp_max c l (- h 1)) (tb2t2 (sort int (get1 (sort (array1 int) (t2tb c)) h)))) ) -;; (comp_max c l h) (comp_max c l (- h 1)) ()) - - -;;; this is a prelude for CVC4 -(set-logic AUFNIRA) -;;; this is a prelude for CVC4 integer arithmetic -(declare-sort uni 0) - -(declare-sort deco 0) - -(declare-sort ty 0) - -(declare-fun sort (ty uni) deco) - -(declare-fun int () ty) - -(declare-fun real () ty) - -(declare-fun bool () ty) - -(declare-fun True () uni) - -(declare-fun False () uni) - -(declare-fun match_bool (deco deco deco) uni) - -;; match_bool_True - (assert - (forall ((a ty)) - (forall ((z uni) (z1 uni)) - (= (sort a (match_bool (sort bool True) (sort a z) (sort a z1))) (sort a z))))) - -;; match_bool_False - (assert - (forall ((a ty)) - (forall ((z uni) (z1 uni)) - (= (sort a (match_bool (sort bool False) (sort a z) (sort a z1))) (sort a - z1))))) - -(declare-fun index_bool (deco) Int) - -;; index_bool_True - (assert (= (index_bool (sort bool True)) 0)) - -;; index_bool_False - (assert (= (index_bool (sort bool False)) 1)) - -;; bool_inversion - (assert - (forall ((u uni)) - (or (= (sort bool u) (sort bool True)) (= (sort bool u) (sort bool False))))) - -(declare-fun tuple0 () ty) - -(declare-fun Tuple0 () uni) - -;; tuple0_inversion - (assert (forall ((u uni)) (= (sort tuple0 u) (sort tuple0 Tuple0)))) - -;; CompatOrderMult - (assert - (forall ((x Int) (y Int) (z Int)) - (=> (<= x y) (=> (<= 0 z) (<= (* x z) (* y z)))))) - -(declare-fun ref (ty) ty) - -(declare-fun mk_ref (deco) uni) - -(declare-fun contents (deco) uni) - -;; contents_def - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort a (contents (sort (ref a) (mk_ref (sort a u))))) (sort a u))))) - -;; ref_inversion - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort (ref a) u) (sort (ref a) - (mk_ref (sort a (contents (sort (ref a) u))))))))) - -(declare-fun map (ty ty) ty) - -(declare-fun get (deco deco) uni) - -(declare-fun set (deco deco deco) uni) - -;; Select_eq - (assert - (forall ((m (Array Int Int))) - (forall ((a1 Int) (a2 Int)) - (forall ((b Int)) - (! (=> (= a1 a2) (= (select (store m a1 b) a2) b)) :pattern ((select (store m a1 b) a2)) ))))) - -;; Select_eq - (assert - (forall ((a ty) (b ty)) - (forall ((m uni)) - (forall ((a1 uni) (a2 uni)) - (forall ((b1 uni)) - (! (=> (= (sort a a1) (sort a a2)) - (= (sort b - (get - (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2))) (sort b b1))) :pattern ((sort b - (get - (sort (map a b) - (set (sort (map a b) m) - (sort a a1) (sort b b1))) - (sort a a2)))) )))))) - -;; Select_neq - (assert - (forall ((m (Array Int Int))) - (forall ((a1 Int) (a2 Int)) - (forall ((b Int)) - (! (=> (not (= a1 a2)) (= (select (store m a1 b) a2) (select m a2))) :pattern ((select (store m a1 b) a2)) ))))) - -;; Select_neq - (assert - (forall ((a ty) (b ty)) - (forall ((m uni)) - (forall ((a1 uni) (a2 uni)) - (forall ((b1 uni)) - (! (=> (not (= (sort a a1) (sort a a2))) - (= (sort b - (get - (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2))) (sort b (get (sort (map a b) m) (sort a a2))))) :pattern ( - (sort b - (get (sort (map a b) (set (sort (map a b) m) (sort a a1) (sort b b1))) - (sort a a2)))) )))))) - -(declare-fun const1 (deco) uni) - -(declare-fun const2 (Int) (Array Int Int)) - -;; Const - (assert (forall ((b Int) (a Int)) (= (select (const2 b) a) b))) - -;; Const - (assert - (forall ((a ty) (b ty)) - (forall ((b1 uni) (a1 uni)) - (= (sort b (get (sort (map a b) (const1 (sort b b1))) (sort a a1))) - (sort b b1))))) - -(declare-sort array 1) - -(declare-fun array1 (ty) ty) - -(declare-fun mk_array (Int deco) uni) - -(declare-fun mk_array1 (Int (Array Int Int)) (array Int)) - -(declare-fun length (deco) Int) - -(declare-fun t2tb ((array Int)) uni) - -(declare-fun tb2t (deco) (array Int)) - -;; BridgeL - (assert - (forall ((i (array Int))) - (! (= (tb2t (sort (array1 int) (t2tb i))) i) :pattern ((sort (array1 int) - (t2tb i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort (array1 int) (t2tb (tb2t (sort (array1 int) j)))) (sort - (array1 int) - j)) :pattern ( - (sort (array1 int) (t2tb (tb2t (sort (array1 int) j))))) ))) - -;; length_def - (assert - (forall ((u Int) (u1 (Array Int Int))) - (= (length (sort (array1 int) (t2tb (mk_array1 u u1)))) u))) - -;; length_def - (assert - (forall ((a ty)) - (forall ((u Int) (u1 uni)) - (= (length (sort (array1 a) (mk_array u (sort (map int a) u1)))) u)))) - -(declare-fun elts (deco) uni) - -(declare-fun t2tb1 ((Array Int Int)) uni) - -(declare-fun tb2t1 (deco) (Array Int Int)) - -;; BridgeL - (assert - (forall ((i (Array Int Int))) - (! (= (tb2t1 (sort (map int int) (t2tb1 i))) i) :pattern ((sort - (map int int) - (t2tb1 i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort (map int int) (t2tb1 (tb2t1 (sort (map int int) j)))) (sort - (map - int - int) j)) :pattern ( - (sort (map int int) (t2tb1 (tb2t1 (sort (map int int) j))))) ))) - -;; elts_def - (assert - (forall ((u Int) (u1 (Array Int Int))) - (= (tb2t1 - (sort (map int int) (elts (sort (array1 int) (t2tb (mk_array1 u u1)))))) u1))) - -;; elts_def - (assert - (forall ((a ty)) - (forall ((u Int) (u1 uni)) - (= (sort (map int a) - (elts (sort (array1 a) (mk_array u (sort (map int a) u1))))) (sort - (map int a) - u1))))) - -;; array_inversion - (assert - (forall ((u (array Int))) - (= u (mk_array1 (length (sort (array1 int) (t2tb u))) - (tb2t1 (sort (map int int) (elts (sort (array1 int) (t2tb u))))))))) - -;; array_inversion - (assert - (forall ((a ty)) - (forall ((u uni)) - (= (sort (array1 a) u) (sort (array1 a) - (mk_array (length (sort (array1 a) u)) - (sort (map int a) (elts (sort (array1 a) u))))))))) - -(declare-fun get1 (deco Int) uni) - -(declare-fun t2tb2 (Int) uni) - -(declare-fun tb2t2 (deco) Int) - -;; BridgeL - (assert - (forall ((i Int)) - (! (= (tb2t2 (sort int (t2tb2 i))) i) :pattern ((sort int (t2tb2 i))) ))) - -;; BridgeR - (assert - (forall ((j uni)) - (! (= (sort int (t2tb2 (tb2t2 (sort int j)))) (sort int j)) :pattern ( - (sort int (t2tb2 (tb2t2 (sort int j))))) ))) - -;; get_def - (assert - (forall ((a (array Int)) (i Int)) - (= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) i))) (select - (tb2t1 (sort (map int int) (elts (sort (array1 int) (t2tb a))))) i)))) - -;; get_def - (assert - (forall ((a ty)) - (forall ((a1 uni) (i Int)) - (= (sort a (get1 (sort (array1 a) a1) i)) (sort a - (get - (sort (map int a) - (elts (sort (array1 a) a1))) - (sort int (t2tb2 i)))))))) - -(declare-fun set1 (deco Int deco) uni) - -;; set_def - (assert - (forall ((a (array Int)) (i Int) (v Int)) - (= (tb2t - (sort (array1 int) - (set1 (sort (array1 int) (t2tb a)) i (sort int (t2tb2 v))))) (mk_array1 - (length - (sort - (array1 - int) - (t2tb a))) - (store - (tb2t1 - (sort - (map - int - int) - (elts - (sort - (array1 - int) - (t2tb a))))) i v))))) - -;; set_def - (assert - (forall ((a ty)) - (forall ((a1 uni) (i Int) (v uni)) - (= (sort (array1 a) (set1 (sort (array1 a) a1) i (sort a v))) (sort - (array1 a) - (mk_array - (length - (sort - (array1 a) - a1)) - (sort - (map int a) - (set - (sort - (map int a) - (elts - (sort - (array1 a) - a1))) - (sort - int - (t2tb2 i)) - (sort a v))))))))) - -(declare-fun make (Int deco) uni) - -;; make_def - (assert - (forall ((n Int) (v Int)) - (= (tb2t (sort (array1 int) (make n (sort int (t2tb2 v))))) (mk_array1 n - (const2 v))))) - -;; make_def - (assert - (forall ((a ty)) - (forall ((n Int) (v uni)) - (= (sort (array1 a) (make n (sort a v))) (sort (array1 a) - (mk_array n - (sort (map int a) - (const1 (sort a v))))))))) - -(declare-fun sum ((Array Int Int) Int Int) Int) - -;; Sum_def_empty - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (<= j i) (= (sum c i j) 0)))) - -;; Sum_def_non_empty - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (< i j) (= (sum c i j) (+ (select c i) (sum c (+ i 1) j)))))) - -;; Sum_right_extension - (assert - (forall ((c (Array Int Int)) (i Int) (j Int)) - (=> (< i j) (= (sum c i j) (+ (sum c i (- j 1)) (select c (- j 1))))))) - -;; Sum_transitivity - (assert - (forall ((c (Array Int Int)) (i Int) (k Int) (j Int)) - (=> (and (<= i k) (<= k j)) (= (sum c i j) (+ (sum c i k) (sum c k j)))))) - -;; Sum_eq - (assert - (forall ((c1 (Array Int Int)) (c2 (Array Int Int)) (i Int) (j Int)) - (=> - (forall ((k Int)) - (=> (and (<= i k) (< k j)) (= (select c1 k) (select c2 k)))) - (= (sum c1 i j) (sum c2 i j))))) - -(declare-fun sum1 ((array Int) Int Int) Int) - -;; sum_def - (assert - (forall ((a (array Int)) (l Int) (h Int)) - (= (sum1 a l h) (sum - (tb2t1 - (sort (map int int) (elts (sort (array1 int) (t2tb a))))) l - h)))) - -(declare-fun is_max ((array Int) Int Int Int) Bool) - -;; is_max_def - (assert - (forall ((a (array Int)) (l Int) (h Int) (m Int)) - (and - (=> (is_max a l h m) - (and - (forall ((k Int)) - (=> (and (<= l k) (< k h)) - (<= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))) m))) - (or (and (<= h l) (= m 0)) - (and (< l h) - (exists ((k Int)) - (and (and (<= l k) (< k h)) - (= m (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k)))))))))) - (=> - (and - (forall ((k Int)) - (=> (and (<= l k) (< k h)) - (<= (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))) m))) - (or (and (<= h l) (= m 0)) - (and (< l h) - (exists ((k Int)) - (and (and (<= l k) (< k h)) - (= m (tb2t2 (sort int (get1 (sort (array1 int) (t2tb a)) k))))))))) (is_max - a l h m))))) - -(declare-fun comp_max ((array Int) Int Int) Int) - -(assert-propagation ((c (array Int)) (l Int) (h Int) (m Int)) () - ((is_max c l h m)) (= m (comp_max c l h)) ()) - -(assert-rewrite ((c (array Int)) (l Int) (h Int)) ((<= h l)) - (comp_max c l h) 0 ()) - -(assert-rewrite ((c (array Int)) (l Int) (h Int)) ((< l h)(< (comp_max c l (- h 1)) (tb2t2 (sort int (get1 (sort (array1 int) (t2tb c)) h)))) ) - (comp_max c l h) (tb2t2 (sort int (get1 (sort (array1 int) (t2tb c)) h))) ()) - -(assert-rewrite ((c (array Int)) (l Int) (h Int)) ((< l h)(>= (comp_max c l (- h 1)) (tb2t2 (sort int (get1 (sort (array1 int) (t2tb c)) h)))) ) - (comp_max c l h) (comp_max c l (- h 1)) ()) - -(assert -;; WP_parameter_test_case - ;; File "vstte10_max_sum/../vstte10_max_sum.mlw", line 63, characters 6-15 - (not - (=> (<= 0 20) - (=> (and (<= 0 0) (< 0 20)) - (forall ((a (Array Int Int))) - (=> (= a (store (const2 0) 0 9)) - (=> (and (<= 0 1) (< 1 20)) - (forall ((a1 (Array Int Int))) - (=> (= a1 (store a 1 5)) - (=> (and (<= 0 2) (< 2 20)) - (forall ((a2 (Array Int Int))) - (=> (= a2 (store a1 2 0)) - (=> (and (<= 0 3) (< 3 20)) - (forall ((a3 (Array Int Int))) - (=> (= a3 (store a2 3 2)) - (=> (and (<= 0 4) (< 4 20)) - (forall ((a4 (Array Int Int))) - (=> (= a4 (store a3 4 7)) - (=> (and (<= 0 5) (< 5 20)) - (forall ((a5 (Array Int Int))) - (=> (= a5 (store a4 5 3)) - (=> (and (<= 0 6) (< 6 20)) - (forall ((a6 (Array Int Int))) - (=> (= a6 (store a5 6 2)) - (=> (and (<= 0 7) (< 7 20)) - (forall ((a7 (Array Int Int))) - (=> (= a7 (store a6 7 1)) - (=> (and (<= 0 8) (< 8 20)) - (forall ((a8 (Array Int Int))) - (=> (= a8 (store a7 8 10)) - (=> (and (<= 0 9) (< 9 20)) - (forall ((a9 (Array Int Int))) - (=> (= a9 (store a8 9 6)) - (=> (and (<= 0 10) (< 10 20)) - (forall ((a10 (Array Int Int))) - (=> (= a10 (store a9 10 9)) - (=> (and (<= 0 11) (< 11 20)) - (forall ((a11 (Array Int Int))) - (=> (= a11 (store a10 11 5)) - (=> (and (<= 0 12) (< 12 20)) - (forall ((a12 (Array Int Int))) - (=> (= a12 (store a11 12 0)) - (=> (and (<= 0 13) (< 13 20)) - (forall ((a13 (Array Int Int))) - (=> (= a13 (store a12 13 2)) - (=> (and (<= 0 14) (< 14 20)) - (forall ((a14 (Array Int Int))) - (=> (= a14 (store a13 14 7)) - (=> (and (<= 0 15) (< 15 20)) - (forall ((a15 (Array Int Int))) - (=> (= a15 (store a14 15 3)) - (=> (and (<= 0 16) (< 16 20)) - (forall ((a16 (Array Int Int))) - (=> (= a16 (store a15 16 2)) - (=> (and (<= 0 17) (< 17 20)) - (forall ((a17 (Array Int Int))) - (=> (= a17 (store a16 17 1)) - (=> (and (<= 0 18) (< 18 20)) - (forall ((a18 (Array Int Int))) - (=> (= a18 (store a17 18 10)) - (=> (and (<= 0 19) (< 19 20)) - (forall ((a19 (Array Int Int))) - (=> (= a19 (store a18 19 6)) - (=> - (and (<= 0 20) - (forall ((i Int)) (=> (and (<= 0 i) (< i 20)) (<= 0 (select a19 i))))) - (forall ((result Int) (result1 Int)) - (=> - (and (= result (sum a19 0 20)) - (and (is_max (mk_array1 20 a19) 0 20 result1) (<= result (* 20 result1)))) - (=> (= result 90) (= result1 10)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) -(check-sat) - diff --git a/test/regress/regress0/sep/Makefile.am b/test/regress/regress0/sep/Makefile.am index 692390dde..9b6c44fa5 100644 --- a/test/regress/regress0/sep/Makefile.am +++ b/test/regress/regress0/sep/Makefile.am @@ -21,42 +21,15 @@ MAKEFLAGS = -k TESTS = \ pto-01.smt2 \ pto-02.smt2 \ - pto-04.smt2 \ sep-01.smt2 \ - sep-02.smt2 \ - sep-03.smt2 \ - sep-find2.smt2 \ - sep-neg-nstrict.smt2 \ sep-plus1.smt2 \ - sep-nterm-val-model.smt2 \ - crash1220.smt2 \ nspatial-simp.smt2 \ - sep-neg-1refine.smt2 \ - sep-neg-simple.smt2 \ sep-simp-unsat-emp.smt2 \ - simple-neg-sat.smt2 \ - wand-simp-sat.smt2 \ - wand-simp-sat2.smt2 \ - wand-simp-unsat.smt2 \ - sep-nterm-again.smt2 \ nemp.smt2 \ wand-crash.smt2 \ - wand-nterm-simp.smt2 \ - wand-nterm-simp2.smt2 \ - chain-int.smt2 \ - sep-neg-swap.smt2 \ - sep-neg-nstrict2.smt2 \ - dispose-list-4-init.smt2 \ - wand-0526-sat.smt2 \ - quant_wand.smt2 \ - fmf-nemp-2.smt2 \ trees-1.smt2 \ - wand-false.smt2 \ dup-nemp.smt2 \ - emp2-quant-unsat.smt2 \ dispose-1.smt2 \ - finite-witness-sat.smt2 \ - sep-fmf-priority.smt2 \ nil-no-elim.smt2 diff --git a/test/regress/regress0/sets/Makefile.am b/test/regress/regress0/sets/Makefile.am index de2170768..afcae32fe 100644 --- a/test/regress/regress0/sets/Makefile.am +++ b/test/regress/regress0/sets/Makefile.am @@ -19,36 +19,22 @@ MAKEFLAGS = -k # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - jan24/insert_invariant_37_2.smt2 \ jan24/deepmeas0.hs.fqout.cvc4.47.smt2 \ jan24/deepmeas0.hs.fqout.small.smt2 \ - jan24/remove_check_free_31_6.smt2 \ - jan27/deepmeas0.hs.fqout.cvc4.41.smt2 \ jan27/ListConcat.hs.fqout.cvc4.177.smt2 \ jan27/ListConcat.hs.fqout.177minimized.smt2 \ - jan27/ListElem.hs.fqout.cvc4.38.smt2 \ jan28/TalkingAboutSets.hs.fqout.3577minimized.smt2 \ jan30/UniqueZipper.hs.fqout.minimized10.smt2 \ - jan30/UniqueZipper.hs.fqout.cvc4.10.smt2 \ jan30/UniqueZipper.hs.fqout.minimized1832.smt2 \ - jan30/UniqueZipper.hs.fqout.cvc4.1832.smt2 \ - feb3/ListElts.hs.fqout.cvc4.317.smt2 \ - mar2014/lemmabug-ListElts317minimized.smt2 \ mar2014/sharing-preregister.smt2 \ mar2014/small.smt2 \ mar2014/smaller.smt2 \ - mar2014/UniqueZipper.hs.1030minimized2.cvc4.smt2 \ - mar2014/UniqueZipper.hs.1030minimized.cvc4.smt2 \ - copy_check_heap_access_33_4.smt2 \ cvc-sample.cvc \ emptyset.smt2 \ error1.smt2 \ error2.smt2 \ eqtest.smt2 \ insert.smt2 \ - fuzz14418.smt2 \ - fuzz15201.smt2 \ - fuzz31811.smt2 \ rec_copy_loop_check_heap_access_43_4.smt2 \ sets-equal.smt2 \ sets-inter.smt2 \ @@ -56,7 +42,6 @@ TESTS = \ sets-sharing.smt2 \ sets-testlemma.smt2 \ sets-union.smt2 \ - sharingbug.smt2 \ union-1a-flip.smt2 \ union-1a.smt2 \ union-1b-flip.smt2 \ @@ -67,11 +52,6 @@ TESTS = \ card-3sets.cvc \ card.smt2 \ card-2.smt2 \ - card-3.smt2 \ - card-4.smt2 \ - card-5.smt2 \ - card-6.smt2 \ - card-7.smt2 \ abt-min.smt2 \ abt-te-exh.smt2 \ abt-te-exh2.smt2 \ @@ -85,24 +65,10 @@ TESTS = \ sets-poly-int-real.smt2 \ sets-poly-nonint.smt2 \ int-real-univ.smt2 \ - int-real-univ-unsat.smt2 \ - sets-tuple-poly.cvc \ - arjun-set-univ.cvc \ - univ-set-uf-elim.smt2 + int-real-univ-unsat.smt2 EXTRA_DIST = $(TESTS) -#if CVC4_BUILD_PROFILE_COMPETITION -#else -#TESTS += \ -# error.cvc -#endif - -# disabled tests, yet distribute -EXTRA_DIST += \ - jan28/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 \ - setofsets-disequal.smt2 - # synonyms for "check" .PHONY: regress regress0 test regress regress0 test: check diff --git a/test/regress/regress0/strings/Makefile.am b/test/regress/regress0/strings/Makefile.am index 7f7511e74..23b13aea2 100644 --- a/test/regress/regress0/strings/Makefile.am +++ b/test/regress/regress0/strings/Makefile.am @@ -19,85 +19,31 @@ MAKEFLAGS = -k # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - at001.smt2 \ bug001.smt2 \ bug002.smt2 \ escchar.smt2 \ escchar_25.smt2 \ - str001.smt2 \ - str002.smt2 \ str003.smt2 \ str004.smt2 \ str005.smt2 \ - str006.smt2 \ - str007.smt2 \ - fmf002.smt2 \ type001.smt2 \ - type003.smt2 \ model001.smt2 \ - substr001.smt2 \ - regexp001.smt2 \ - regexp002.smt2 \ - regexp003.smt2 \ leadingzero001.smt2 \ loop001.smt2 \ - loop002.smt2 \ - loop003.smt2 \ - loop004.smt2 \ - loop005.smt2 \ - loop006.smt2 \ - loop007.smt2 \ - loop008.smt2 \ - loop009.smt2 \ - reloop.smt2 \ unsound-0908.smt2 \ - ilc-like.smt2 \ - ilc-l-nt.smt2 \ - artemis-0512-nonterm.smt2 \ + ilc-like.smt2 \ indexof-sym-simp.smt2 \ bug613.smt2 \ - idof-triv.smt2 \ - chapman150408.smt2 \ - pierre150331.smt2 \ - norn-360.smt2 \ norn-simp-rew.smt2 \ - norn-simp-rew-sat.smt2 \ - idof-nconst-index.smt2 \ - idof-neg-index.smt2 \ bug612.smt2 \ - bug615.smt2 \ - kaluza-fl.smt2 \ idof-rewrites.smt2 \ - bug682.smt2 \ - bug686dd.smt2 \ - idof-handg.smt2 \ - fmf001.smt2 \ - crash-1019.smt2 \ norn-31.smt2 \ strings-native-simple.cvc \ - cmu-2db2-extf-reg.smt2 \ - norn-nel-bug-052116.smt2 \ - cmu-disagree-0707-dd.smt2 \ - nf-ff-contains-abs.smt2 \ - csp-prefix-exp-bug.smt2 \ - cmu-substr-rw.smt2 \ - gm-inc-071516-2.smt2 \ - cmu-inc-nlpp-071516.smt2 \ - strings-index-empty.smt2 \ - bug768.smt2 \ - username_checker_min.smt2 \ - repl-empty-sem.smt2 \ - bug799-min.smt2 \ strings-charat.cvc \ - issue1105.smt2 \ issue1189.smt2 \ rewrites-v2.smt2 \ substr-rewrites.smt2 \ - norn-ab.smt2 \ - type002.smt2 \ - strip-endpt-sound.smt2 \ - repl-rewrites2.smt2 \ - repl-soundness-sem.smt2 + repl-rewrites2.smt2 FAILING_TESTS = @@ -106,9 +52,6 @@ EXTRA_DIST = $(TESTS) # and make sure to distribute it EXTRA_DIST += -#norn-dis-0707-3.smt2 - - # synonyms for "check" .PHONY: regress regress0 test regress regress0 test: check diff --git a/test/regress/regress0/subranges.cvc b/test/regress/regress0/subranges.cvc deleted file mode 100644 index bf6e46938..000000000 --- a/test/regress/regress0/subranges.cvc +++ /dev/null @@ -1,15 +0,0 @@ -% EXPECT: valid - -A : [0..0]; -B : [ -5 .. 8]; -C : [1..3]; -D : [1..2]; -E : [-100 ..-1]; -F : [-100 ..0]; -G : [-100 ..1]; -H : [-1 ..1]; -I : [0..10]; -J : [-10..-9]; -K : [-10..-10]; - -QUERY TRUE; diff --git a/test/regress/regress0/sygus/Makefile.am b/test/regress/regress0/sygus/Makefile.am index 9e7427eb0..fef4546e9 100644 --- a/test/regress/regress0/sygus/Makefile.am +++ b/test/regress/regress0/sygus/Makefile.am @@ -18,90 +18,26 @@ MAKEFLAGS = -k # These are run for all build profiles. # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" -TESTS = commutative.sy \ - constant.sy \ - multi-fun-polynomial2.sy \ - unbdd_inv_gen_winf1.sy \ - max.sy \ - array_sum_2_5.sy \ +TESTS = \ parity-AIG-d0.sy \ - twolets1.sy \ - array_search_2.sy \ - hd-01-d1-prog.sy \ - icfp_28_10.sy \ const-var-test.sy \ no-syntax-test.sy \ - no-flat-simp.sy \ - twolets2-orig.sy \ let-ringer.sy \ let-simp.sy \ - tl-type.sy \ - dup-op.sy \ - nflat-fwd.sy \ - nflat-fwd-3.sy \ no-syntax-test-bool.sy \ - inv-example.sy \ uminus_one.sy \ - sygus-dt.sy \ dt-no-syntax.sy \ - list-head-x.sy \ - clock-inc-tuple.sy \ - dt-test-ns.sy \ - no-mention.sy \ - max2-univ.sy \ - strings-small.sy \ strings-unconstrained.sy \ - tl-type-4x.sy \ - tl-type-0.sy \ - fg_polynomial3.sy \ - icfp_14.12.sy \ - strings-trivial-simp.sy \ - icfp_easy-ite.sy \ - strings-template-infer.sy \ - strings-trivial.sy \ General_plus10.sy \ - qe.sy \ - cggmp.sy \ parse-bv-let.sy \ - cegar1.sy \ - triv-type-mismatch-si.sy \ - nia-max-square-ns.sy \ - strings-concat-3-args.sy \ - process-10-vars.sy \ - process-10-vars-2fun.sy \ - inv-unused.sy \ ccp16.lus.sy \ - icfp_14.12-flip-args.sy \ - strings-template-infer-unused.sy \ - strings-trivial-two-type.sy \ - strings-double-rec.sy \ - hd-19-d1-prog-dup-op.sy \ - real-grammar-neg.sy \ real-si-all.sy \ c100.sy \ check-generic-red.sy -# disabled, takes too long with and without CBQI BV -# Base16_1.sy - # sygus tests currently taking too long for make regress EXTRA_DIST = $(TESTS) \ - max.smt2 \ - sygus-uf.sl \ - enum-test.sy - -# strings-concat-3-args.sy - -#if CVC4_BUILD_PROFILE_COMPETITION -#else -#TESTS += \ -# error.cvc -#endif - -# disabled tests, yet distribute -#EXTRA_DIST += \ -# setofsets-disequal.smt2 -# no-syntax-test-no-si.sy + sygus-uf.sl # synonyms for "check" .PHONY: regress regress0 test diff --git a/test/regress/regress0/sygus/max.smt2 b/test/regress/regress0/sygus/max.smt2 deleted file mode 100644 index ab2d4de05..000000000 --- a/test/regress/regress0/sygus/max.smt2 +++ /dev/null @@ -1,52 +0,0 @@ -; EXPECT: unsat -; COMMAND-LINE: --cegqi --lang=smt2.5 - -(set-logic UFDTLIA) - -(declare-datatypes () ((start (startx) - (starty) - (start1) - (start0) - (startplus (startplus1 start) (startplus2 start)) - (startminus (startminus1 start) (startminus2 start)) - (startite (startite1 startbool) (startite2 start) (startite3 start))) - (startbool (startand (startand1 startbool) (startand2 startbool)) - (startor (startor1 startbool) (startor2 startbool)) - (startnot (startnot1 startbool)) - (startleq (startleq1 start) (startleq2 start)) - (starteq (starteq1 start) (starteq2 start)) - (startgeq (startgeq1 start) (startgeq2 start)) - ))) - -(declare-fun eval (start Int Int) Int) -(declare-fun evalbool (startbool Int Int) Bool) - -(assert (forall ((x Int) (y Int)) (! (= (eval startx x y) x) :pattern ((eval startx x y))))) -(assert (forall ((x Int) (y Int)) (! (= (eval starty x y) y) :pattern ((eval starty x y))))) -(assert (forall ((x Int) (y Int)) (! (= (eval start0 x y) 0) :pattern ((eval start0 x y))))) -(assert (forall ((x Int) (y Int)) (! (= (eval start1 x y) 1) :pattern ((eval start1 x y))))) -(assert (forall ((s1 start) (s2 start) (x Int) (y Int)) (! (= (eval (startplus s1 s2) x y) (+ (eval s1 x y) (eval s2 x y))) :pattern ((eval (startplus s1 s2) x y))))) -(assert (forall ((s1 start) (s2 start) (x Int) (y Int)) (! (= (eval (startminus s1 s2) x y) (- (eval s1 x y) (eval s2 x y))) :pattern ((eval (startminus s1 s2) x y))))) -(assert (forall ((s1 startbool) (s2 start) (s3 start) (x Int) (y Int)) (! (= (eval (startite s1 s2 s3) x y) (ite (evalbool s1 x y) (eval s2 x y) (eval s3 x y))) - :pattern ((eval (startite s1 s2 s3) x y))))) - -(assert (forall ((s1 startbool) (s2 startbool) (x Int) (y Int)) (! (= (evalbool (startand s1 s2) x y) (and (evalbool s1 x y) (evalbool s2 x y))) - :pattern ((evalbool (startand s1 s2) x y))))) -(assert (forall ((s1 startbool) (s2 startbool) (x Int) (y Int)) (! (= (evalbool (startor s1 s2) x y) (or (evalbool s1 x y) (evalbool s2 x y))) - :pattern ((evalbool (startor s1 s2) x y))))) -(assert (forall ((s1 startbool) (x Int) (y Int)) (! (= (evalbool (startnot s1) x y) (not (evalbool s1 x y))) - :pattern ((evalbool (startnot s1) x y))))) -(assert (forall ((s1 start) (s2 start) (x Int) (y Int)) (! (= (evalbool (startleq s1 s2) x y) (<= (eval s1 x y) (eval s2 x y))) - :pattern ((evalbool (startleq s1 s2) x y))))) -(assert (forall ((s1 start) (s2 start) (x Int) (y Int)) (! (= (evalbool (starteq s1 s2) x y) (= (eval s1 x y) (eval s2 x y))) - :pattern ((evalbool (starteq s1 s2) x y))))) -(assert (forall ((s1 start) (s2 start) (x Int) (y Int)) (! (= (evalbool (startgeq s1 s2) x y) (>= (eval s1 x y) (eval s2 x y))) - :pattern ((evalbool (startgeq s1 s2) x y))))) - - -(define-fun P ((fmax start) (x Int) (y Int)) Bool (and (>= (eval fmax x y) x) (>= (eval fmax x y) y) (or (= (eval fmax x y) x) (= (eval fmax x y) y)))) - -(assert (forall ((fmax start)) (! (exists ((x Int) (y Int)) (not (P fmax x y))) :sygus))) - - -(check-sat) diff --git a/test/regress/regress0/uf/Makefile.am b/test/regress/regress0/uf/Makefile.am index 8a4ce33b7..dd8621618 100644 --- a/test/regress/regress0/uf/Makefile.am +++ b/test/regress/regress0/uf/Makefile.am @@ -40,12 +40,10 @@ TESTS = \ ccredesign-fuzz.smt \ dead_dnd002.smt \ iso_brn001.smt \ - gensys_brn001.smt2 \ simple.01.cvc \ simple.02.cvc \ simple.03.cvc \ simple.04.cvc \ - proof00.smt2 \ cnf-iff.smt2 \ cnf-iff-base.smt2 \ cnf-ite.smt2 \ diff --git a/test/regress/regress0/uflia/Makefile.am b/test/regress/regress0/uflia/Makefile.am index db67df18e..e40a28608 100644 --- a/test/regress/regress0/uflia/Makefile.am +++ b/test/regress/regress0/uflia/Makefile.am @@ -27,7 +27,6 @@ SMT_TESTS = \ xs-09-16-3-4-1-5.delta04.smt \ error1.smt \ error0.delta01.smt \ - simple_cyclic2.smt2 \ error30.smt # Regression tests for SMT2 inputs @@ -36,17 +35,8 @@ SMT2_TESTS = \ check02.smt2 \ check03.smt2 \ check04.smt2 \ - DRAGON_11_e1_2450.ec.minimized.smt2 \ - FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 \ - 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 \ - 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 + tiny.smt2 # Regression tests for PL inputs CVC_TESTS = @@ -62,11 +52,7 @@ EXTRA_DIST = $(TESTS) \ check02.smt2.expect \ check03.smt2.expect \ check04.smt2.expect \ - DRAGON_11_e1_2450.ec.minimized.smt2.expect \ - FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect \ - speed2_e8_449_e8_517.ec.smt2.expect \ stalmark_e7_27_e7_31.ec.minimized.smt2.expect \ - stalmark_e7_27_e7_31.ec.smt2.expect \ tiny.smt2.expect # synonyms for "check" in this directory diff --git a/test/regress/regress0/uflra/Makefile.am b/test/regress/regress0/uflra/Makefile.am index 78bb67bcb..d8c14b37e 100644 --- a/test/regress/regress0/uflra/Makefile.am +++ b/test/regress/regress0/uflra/Makefile.am @@ -41,17 +41,13 @@ SMT_TESTS = \ neq-deltacomp.smt \ fuzz01.smt -# Regression tests for SMT2 inputs -SMT2_TESTS = \ - bug800.smt2 - # Regression tests for PL inputs CVC_TESTS = # Regression tests derived from bug reports BUG_TESTS = -TESTS = $(SMT_TESTS) $(SMT2_TESTS) $(CVC_TESTS) $(BUG_TESTS) +TESTS = $(SMT_TESTS) $(CVC_TESTS) $(BUG_TESTS) # Necessary to get automake's attention when splitting TESTS into # SMT_TESTS, SMT2_TESTS, etc.. diff --git a/test/regress/regress0/unconstrained/Makefile.am b/test/regress/regress0/unconstrained/Makefile.am index b21227253..0d0c7cdb2 100644 --- a/test/regress/regress0/unconstrained/Makefile.am +++ b/test/regress/regress0/unconstrained/Makefile.am @@ -37,7 +37,6 @@ TESTS = \ bvbool.smt2 \ bvcmp.smt2 \ bvconcat2.smt2 \ - bvdiv2.smt2 \ bvext.smt2 \ bvite.smt2 \ bvmul2.smt2 \ @@ -70,7 +69,6 @@ TESTS = \ leq.smt2 \ lt.smt2 \ uf1.smt2 \ - uf2.smt2 \ xor.smt2 \ mult1.smt2 diff --git a/test/regress/regress1/Makefile.am b/test/regress/regress1/Makefile.am index 9bf23f555..af3f65370 100644 --- a/test/regress/regress1/Makefile.am +++ b/test/regress/regress1/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . bv aufbv auflia datatypes rewriterules lemmas decision fmf nl strings sets sygus sep quantifiers +SUBDIRS = . arith bv aufbv auflia datatypes rewriterules lemmas decision fmf ho nl push-pop quantifiers rels strings sets sygus sep uflia # don't override a BINARY imported from a personal.mk @mk_if@eq ($(BINARY),) @@ -20,11 +20,54 @@ MAKEFLAGS = -k # These are run for all build profiles. # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" -TESTS = bug425.cvc \ - bug519.smt2 \ - bug521.smt2 - -EXTRA_DIST = $(TESTS) +TESTS = \ + bug425.cvc \ + bug519.smt2 \ + bug521.smt2 \ + bug694-Unapply1.scala-0.smt2 \ + fmf-fun-dbu.smt2 \ + bug296.smt2 \ + bug507.smt2 \ + gensys_brn001.smt2 \ + simplification_bug4.smt2 \ + trim.cvc \ + constarr3.cvc \ + constarr3.smt2 \ + parsing_ringer.cvc \ + arrayinuf_error.smt2 \ + boolean-terms-kernel2.smt2 \ + boolean.cvc \ + bug216.smt2 \ + bug512.smt2 \ + bug516.smt2 \ + bug520.smt2 \ + bug543.smt2 \ + bug567.smt2 \ + bug593.smt2 \ + bug681.smt2 \ + bug800.smt2 \ + bvdiv2.smt2 \ + error.cvc \ + errorcrash.smt2 \ + hole6.cvc \ + ite5.smt2 \ + non-fatal-errors.smt2 \ + proof00.smt2 \ + sqrt2-sort-inf-unk.smt2 \ + test12.cvc \ + uf2.smt2 + +EXTRA_DIST = $(TESTS) \ + simplification_bug4.smt2.expect \ + bug590.smt2.expect \ + bug216.smt2.expect \ + bug590.smt2 \ + bug585.cvc \ + crash_burn_locusts.smt2 \ + bug472.smt2 \ + simple-rdl-definefun.smt2 + +# issue1048-arrays-int-real.smt2 -- different errors on debug and production # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress1/arith/Makefile.am b/test/regress/regress1/arith/Makefile.am new file mode 100644 index 000000000..e2b0e93d9 --- /dev/null +++ b/test/regress/regress1/arith/Makefile.am @@ -0,0 +1,139 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + arith-int-004.cvc \ + arith-int-011.cvc \ + arith-int-048.cvc \ + arith-int-050.cvc \ + arith-int-084.cvc \ + arith-int-085.cvc \ + arith-int-097.cvc \ + bug716.0.smt2 \ + problem__003.smt2 \ + bug547.1.smt2 \ + bug716.1.cvc \ + div.03.smt2 \ + div.06.smt2 \ + div.08.smt2 \ + div.09.smt2 \ + miplib3.cvc \ + mod.02.smt2 \ + mod.03.smt2 \ + mult.02.smt2 \ + arith-int-012.cvc \ + arith-int-013.cvc \ + arith-int-022.cvc \ + arith-int-024.cvc \ + arith-int-047.cvc + +EXTRA_DIST = $(TESTS) \ + arith-int-008.cvc \ + arith-int-018.cvc \ + arith-int-020.cvc \ + arith-int-026.cvc \ + arith-int-029.cvc \ + arith-int-030.cvc \ + arith-int-043.cvc \ + arith-int-044.cvc \ + arith-int-049.cvc \ + arith-int-061.cvc \ + arith-int-062.cvc \ + arith-int-064.cvc \ + arith-int-065.cvc \ + arith-int-081.cvc \ + arith-int-083.cvc \ + arith-int-090.cvc \ + arith-int-091.cvc \ + arith-int-092.cvc \ + arith-int-094.cvc \ + arith-int-096.cvc \ + arith-int-098.cvc \ + arith-int-001.cvc \ + arith-int-002.cvc \ + arith-int-003.cvc \ + arith-int-005.cvc \ + arith-int-006.cvc \ + arith-int-009.cvc \ + arith-int-010.cvc \ + arith-int-016.cvc \ + arith-int-017.cvc \ + arith-int-019.cvc \ + arith-int-027.cvc \ + arith-int-028.cvc \ + arith-int-031.cvc \ + arith-int-032.cvc \ + arith-int-033.cvc \ + arith-int-034.cvc \ + arith-int-035.cvc \ + arith-int-036.cvc \ + arith-int-037.cvc \ + arith-int-038.cvc \ + arith-int-039.cvc \ + arith-int-040.cvc \ + arith-int-041.cvc \ + arith-int-045.cvc \ + arith-int-046.cvc \ + arith-int-051.cvc \ + arith-int-052.cvc \ + arith-int-053.cvc \ + arith-int-054.cvc \ + arith-int-055.cvc \ + arith-int-056.cvc \ + arith-int-057.cvc \ + arith-int-058.cvc \ + arith-int-059.cvc \ + arith-int-060.cvc \ + arith-int-063.cvc \ + arith-int-066.cvc \ + arith-int-067.cvc \ + arith-int-068.cvc \ + arith-int-069.cvc \ + arith-int-070.cvc \ + arith-int-071.cvc \ + arith-int-072.cvc \ + arith-int-073.cvc \ + arith-int-074.cvc \ + arith-int-075.cvc \ + arith-int-076.cvc \ + arith-int-077.cvc \ + arith-int-078.cvc \ + arith-int-080.cvc \ + arith-int-086.cvc \ + arith-int-087.cvc \ + arith-int-088.cvc \ + arith-int-089.cvc \ + arith-int-093.cvc \ + arith-int-095.cvc \ + arith-int-099.cvc \ + arith-int-100.cvc + +FAILING_TESTS = \ + arith-int-007.cvc \ + arith-int-082.cvc \ + arith-int-098.cvc + +EXTRA_DIST = $(TESTS) + +# synonyms for "check" in this directory +.PHONY: regress regress1 test +regress regress1 test: check + +# do nothing in this subdir +.PHONY: regress0 regress2 regress3 regress4 +regress0 regress2 regress3 regress4: diff --git a/test/regress/regress0/arith/integers/arith-int-001.cvc b/test/regress/regress1/arith/arith-int-001.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-001.cvc rename to test/regress/regress1/arith/arith-int-001.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-002.cvc b/test/regress/regress1/arith/arith-int-002.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-002.cvc rename to test/regress/regress1/arith/arith-int-002.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-003.cvc b/test/regress/regress1/arith/arith-int-003.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-003.cvc rename to test/regress/regress1/arith/arith-int-003.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-004.cvc b/test/regress/regress1/arith/arith-int-004.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-004.cvc rename to test/regress/regress1/arith/arith-int-004.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-005.cvc b/test/regress/regress1/arith/arith-int-005.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-005.cvc rename to test/regress/regress1/arith/arith-int-005.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-006.cvc b/test/regress/regress1/arith/arith-int-006.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-006.cvc rename to test/regress/regress1/arith/arith-int-006.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-007.cvc b/test/regress/regress1/arith/arith-int-007.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-007.cvc rename to test/regress/regress1/arith/arith-int-007.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-008.cvc b/test/regress/regress1/arith/arith-int-008.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-008.cvc rename to test/regress/regress1/arith/arith-int-008.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-009.cvc b/test/regress/regress1/arith/arith-int-009.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-009.cvc rename to test/regress/regress1/arith/arith-int-009.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-010.cvc b/test/regress/regress1/arith/arith-int-010.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-010.cvc rename to test/regress/regress1/arith/arith-int-010.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-011.cvc b/test/regress/regress1/arith/arith-int-011.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-011.cvc rename to test/regress/regress1/arith/arith-int-011.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-012.cvc b/test/regress/regress1/arith/arith-int-012.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-012.cvc rename to test/regress/regress1/arith/arith-int-012.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-013.cvc b/test/regress/regress1/arith/arith-int-013.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-013.cvc rename to test/regress/regress1/arith/arith-int-013.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-016.cvc b/test/regress/regress1/arith/arith-int-016.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-016.cvc rename to test/regress/regress1/arith/arith-int-016.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-017.cvc b/test/regress/regress1/arith/arith-int-017.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-017.cvc rename to test/regress/regress1/arith/arith-int-017.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-018.cvc b/test/regress/regress1/arith/arith-int-018.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-018.cvc rename to test/regress/regress1/arith/arith-int-018.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-019.cvc b/test/regress/regress1/arith/arith-int-019.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-019.cvc rename to test/regress/regress1/arith/arith-int-019.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-020.cvc b/test/regress/regress1/arith/arith-int-020.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-020.cvc rename to test/regress/regress1/arith/arith-int-020.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-022.cvc b/test/regress/regress1/arith/arith-int-022.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-022.cvc rename to test/regress/regress1/arith/arith-int-022.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-024.cvc b/test/regress/regress1/arith/arith-int-024.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-024.cvc rename to test/regress/regress1/arith/arith-int-024.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-026.cvc b/test/regress/regress1/arith/arith-int-026.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-026.cvc rename to test/regress/regress1/arith/arith-int-026.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-027.cvc b/test/regress/regress1/arith/arith-int-027.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-027.cvc rename to test/regress/regress1/arith/arith-int-027.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-028.cvc b/test/regress/regress1/arith/arith-int-028.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-028.cvc rename to test/regress/regress1/arith/arith-int-028.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-029.cvc b/test/regress/regress1/arith/arith-int-029.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-029.cvc rename to test/regress/regress1/arith/arith-int-029.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-030.cvc b/test/regress/regress1/arith/arith-int-030.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-030.cvc rename to test/regress/regress1/arith/arith-int-030.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-031.cvc b/test/regress/regress1/arith/arith-int-031.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-031.cvc rename to test/regress/regress1/arith/arith-int-031.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-032.cvc b/test/regress/regress1/arith/arith-int-032.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-032.cvc rename to test/regress/regress1/arith/arith-int-032.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-033.cvc b/test/regress/regress1/arith/arith-int-033.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-033.cvc rename to test/regress/regress1/arith/arith-int-033.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-034.cvc b/test/regress/regress1/arith/arith-int-034.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-034.cvc rename to test/regress/regress1/arith/arith-int-034.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-035.cvc b/test/regress/regress1/arith/arith-int-035.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-035.cvc rename to test/regress/regress1/arith/arith-int-035.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-036.cvc b/test/regress/regress1/arith/arith-int-036.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-036.cvc rename to test/regress/regress1/arith/arith-int-036.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-037.cvc b/test/regress/regress1/arith/arith-int-037.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-037.cvc rename to test/regress/regress1/arith/arith-int-037.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-038.cvc b/test/regress/regress1/arith/arith-int-038.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-038.cvc rename to test/regress/regress1/arith/arith-int-038.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-039.cvc b/test/regress/regress1/arith/arith-int-039.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-039.cvc rename to test/regress/regress1/arith/arith-int-039.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-040.cvc b/test/regress/regress1/arith/arith-int-040.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-040.cvc rename to test/regress/regress1/arith/arith-int-040.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-041.cvc b/test/regress/regress1/arith/arith-int-041.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-041.cvc rename to test/regress/regress1/arith/arith-int-041.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-043.cvc b/test/regress/regress1/arith/arith-int-043.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-043.cvc rename to test/regress/regress1/arith/arith-int-043.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-044.cvc b/test/regress/regress1/arith/arith-int-044.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-044.cvc rename to test/regress/regress1/arith/arith-int-044.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-045.cvc b/test/regress/regress1/arith/arith-int-045.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-045.cvc rename to test/regress/regress1/arith/arith-int-045.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-046.cvc b/test/regress/regress1/arith/arith-int-046.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-046.cvc rename to test/regress/regress1/arith/arith-int-046.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-047.cvc b/test/regress/regress1/arith/arith-int-047.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-047.cvc rename to test/regress/regress1/arith/arith-int-047.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-048.cvc b/test/regress/regress1/arith/arith-int-048.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-048.cvc rename to test/regress/regress1/arith/arith-int-048.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-049.cvc b/test/regress/regress1/arith/arith-int-049.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-049.cvc rename to test/regress/regress1/arith/arith-int-049.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-050.cvc b/test/regress/regress1/arith/arith-int-050.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-050.cvc rename to test/regress/regress1/arith/arith-int-050.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-051.cvc b/test/regress/regress1/arith/arith-int-051.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-051.cvc rename to test/regress/regress1/arith/arith-int-051.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-052.cvc b/test/regress/regress1/arith/arith-int-052.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-052.cvc rename to test/regress/regress1/arith/arith-int-052.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-053.cvc b/test/regress/regress1/arith/arith-int-053.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-053.cvc rename to test/regress/regress1/arith/arith-int-053.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-054.cvc b/test/regress/regress1/arith/arith-int-054.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-054.cvc rename to test/regress/regress1/arith/arith-int-054.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-055.cvc b/test/regress/regress1/arith/arith-int-055.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-055.cvc rename to test/regress/regress1/arith/arith-int-055.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-056.cvc b/test/regress/regress1/arith/arith-int-056.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-056.cvc rename to test/regress/regress1/arith/arith-int-056.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-057.cvc b/test/regress/regress1/arith/arith-int-057.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-057.cvc rename to test/regress/regress1/arith/arith-int-057.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-058.cvc b/test/regress/regress1/arith/arith-int-058.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-058.cvc rename to test/regress/regress1/arith/arith-int-058.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-059.cvc b/test/regress/regress1/arith/arith-int-059.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-059.cvc rename to test/regress/regress1/arith/arith-int-059.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-060.cvc b/test/regress/regress1/arith/arith-int-060.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-060.cvc rename to test/regress/regress1/arith/arith-int-060.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-061.cvc b/test/regress/regress1/arith/arith-int-061.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-061.cvc rename to test/regress/regress1/arith/arith-int-061.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-062.cvc b/test/regress/regress1/arith/arith-int-062.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-062.cvc rename to test/regress/regress1/arith/arith-int-062.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-063.cvc b/test/regress/regress1/arith/arith-int-063.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-063.cvc rename to test/regress/regress1/arith/arith-int-063.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-064.cvc b/test/regress/regress1/arith/arith-int-064.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-064.cvc rename to test/regress/regress1/arith/arith-int-064.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-065.cvc b/test/regress/regress1/arith/arith-int-065.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-065.cvc rename to test/regress/regress1/arith/arith-int-065.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-066.cvc b/test/regress/regress1/arith/arith-int-066.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-066.cvc rename to test/regress/regress1/arith/arith-int-066.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-067.cvc b/test/regress/regress1/arith/arith-int-067.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-067.cvc rename to test/regress/regress1/arith/arith-int-067.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-068.cvc b/test/regress/regress1/arith/arith-int-068.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-068.cvc rename to test/regress/regress1/arith/arith-int-068.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-069.cvc b/test/regress/regress1/arith/arith-int-069.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-069.cvc rename to test/regress/regress1/arith/arith-int-069.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-070.cvc b/test/regress/regress1/arith/arith-int-070.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-070.cvc rename to test/regress/regress1/arith/arith-int-070.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-071.cvc b/test/regress/regress1/arith/arith-int-071.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-071.cvc rename to test/regress/regress1/arith/arith-int-071.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-072.cvc b/test/regress/regress1/arith/arith-int-072.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-072.cvc rename to test/regress/regress1/arith/arith-int-072.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-073.cvc b/test/regress/regress1/arith/arith-int-073.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-073.cvc rename to test/regress/regress1/arith/arith-int-073.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-074.cvc b/test/regress/regress1/arith/arith-int-074.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-074.cvc rename to test/regress/regress1/arith/arith-int-074.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-075.cvc b/test/regress/regress1/arith/arith-int-075.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-075.cvc rename to test/regress/regress1/arith/arith-int-075.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-076.cvc b/test/regress/regress1/arith/arith-int-076.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-076.cvc rename to test/regress/regress1/arith/arith-int-076.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-077.cvc b/test/regress/regress1/arith/arith-int-077.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-077.cvc rename to test/regress/regress1/arith/arith-int-077.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-078.cvc b/test/regress/regress1/arith/arith-int-078.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-078.cvc rename to test/regress/regress1/arith/arith-int-078.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-080.cvc b/test/regress/regress1/arith/arith-int-080.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-080.cvc rename to test/regress/regress1/arith/arith-int-080.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-081.cvc b/test/regress/regress1/arith/arith-int-081.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-081.cvc rename to test/regress/regress1/arith/arith-int-081.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-082.cvc b/test/regress/regress1/arith/arith-int-082.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-082.cvc rename to test/regress/regress1/arith/arith-int-082.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-083.cvc b/test/regress/regress1/arith/arith-int-083.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-083.cvc rename to test/regress/regress1/arith/arith-int-083.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-084.cvc b/test/regress/regress1/arith/arith-int-084.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-084.cvc rename to test/regress/regress1/arith/arith-int-084.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-085.cvc b/test/regress/regress1/arith/arith-int-085.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-085.cvc rename to test/regress/regress1/arith/arith-int-085.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-086.cvc b/test/regress/regress1/arith/arith-int-086.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-086.cvc rename to test/regress/regress1/arith/arith-int-086.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-087.cvc b/test/regress/regress1/arith/arith-int-087.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-087.cvc rename to test/regress/regress1/arith/arith-int-087.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-088.cvc b/test/regress/regress1/arith/arith-int-088.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-088.cvc rename to test/regress/regress1/arith/arith-int-088.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-089.cvc b/test/regress/regress1/arith/arith-int-089.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-089.cvc rename to test/regress/regress1/arith/arith-int-089.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-090.cvc b/test/regress/regress1/arith/arith-int-090.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-090.cvc rename to test/regress/regress1/arith/arith-int-090.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-091.cvc b/test/regress/regress1/arith/arith-int-091.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-091.cvc rename to test/regress/regress1/arith/arith-int-091.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-092.cvc b/test/regress/regress1/arith/arith-int-092.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-092.cvc rename to test/regress/regress1/arith/arith-int-092.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-093.cvc b/test/regress/regress1/arith/arith-int-093.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-093.cvc rename to test/regress/regress1/arith/arith-int-093.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-094.cvc b/test/regress/regress1/arith/arith-int-094.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-094.cvc rename to test/regress/regress1/arith/arith-int-094.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-095.cvc b/test/regress/regress1/arith/arith-int-095.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-095.cvc rename to test/regress/regress1/arith/arith-int-095.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-096.cvc b/test/regress/regress1/arith/arith-int-096.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-096.cvc rename to test/regress/regress1/arith/arith-int-096.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-097.cvc b/test/regress/regress1/arith/arith-int-097.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-097.cvc rename to test/regress/regress1/arith/arith-int-097.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-099.cvc b/test/regress/regress1/arith/arith-int-099.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-099.cvc rename to test/regress/regress1/arith/arith-int-099.cvc diff --git a/test/regress/regress0/arith/integers/arith-int-100.cvc b/test/regress/regress1/arith/arith-int-100.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-100.cvc rename to test/regress/regress1/arith/arith-int-100.cvc diff --git a/test/regress/regress0/arith/bug547.1.smt2 b/test/regress/regress1/arith/bug547.1.smt2 similarity index 100% rename from test/regress/regress0/arith/bug547.1.smt2 rename to test/regress/regress1/arith/bug547.1.smt2 diff --git a/test/regress/regress0/arith/bug716.0.smt2 b/test/regress/regress1/arith/bug716.0.smt2 similarity index 100% rename from test/regress/regress0/arith/bug716.0.smt2 rename to test/regress/regress1/arith/bug716.0.smt2 diff --git a/test/regress/regress0/arith/bug716.1.cvc b/test/regress/regress1/arith/bug716.1.cvc similarity index 100% rename from test/regress/regress0/arith/bug716.1.cvc rename to test/regress/regress1/arith/bug716.1.cvc diff --git a/test/regress/regress0/arith/div.03.smt2 b/test/regress/regress1/arith/div.03.smt2 similarity index 100% rename from test/regress/regress0/arith/div.03.smt2 rename to test/regress/regress1/arith/div.03.smt2 diff --git a/test/regress/regress0/arith/div.06.smt2 b/test/regress/regress1/arith/div.06.smt2 similarity index 100% rename from test/regress/regress0/arith/div.06.smt2 rename to test/regress/regress1/arith/div.06.smt2 diff --git a/test/regress/regress0/arith/div.08.smt2 b/test/regress/regress1/arith/div.08.smt2 similarity index 100% rename from test/regress/regress0/arith/div.08.smt2 rename to test/regress/regress1/arith/div.08.smt2 diff --git a/test/regress/regress0/arith/div.09.smt2 b/test/regress/regress1/arith/div.09.smt2 similarity index 100% rename from test/regress/regress0/arith/div.09.smt2 rename to test/regress/regress1/arith/div.09.smt2 diff --git a/test/regress/regress0/arith/miplib3.cvc b/test/regress/regress1/arith/miplib3.cvc similarity index 100% rename from test/regress/regress0/arith/miplib3.cvc rename to test/regress/regress1/arith/miplib3.cvc diff --git a/test/regress/regress0/arith/mod.02.smt2 b/test/regress/regress1/arith/mod.02.smt2 similarity index 100% rename from test/regress/regress0/arith/mod.02.smt2 rename to test/regress/regress1/arith/mod.02.smt2 diff --git a/test/regress/regress0/arith/mod.03.smt2 b/test/regress/regress1/arith/mod.03.smt2 similarity index 100% rename from test/regress/regress0/arith/mod.03.smt2 rename to test/regress/regress1/arith/mod.03.smt2 diff --git a/test/regress/regress0/arith/mult.02.smt2 b/test/regress/regress1/arith/mult.02.smt2 similarity index 100% rename from test/regress/regress0/arith/mult.02.smt2 rename to test/regress/regress1/arith/mult.02.smt2 diff --git a/test/regress/regress0/arith/problem__003.smt2 b/test/regress/regress1/arith/problem__003.smt2 similarity index 100% rename from test/regress/regress0/arith/problem__003.smt2 rename to test/regress/regress1/arith/problem__003.smt2 diff --git a/test/regress/regress0/arrayinuf_error.smt2 b/test/regress/regress1/arrayinuf_error.smt2 similarity index 100% rename from test/regress/regress0/arrayinuf_error.smt2 rename to test/regress/regress1/arrayinuf_error.smt2 diff --git a/test/regress/regress1/aufbv/Makefile.am b/test/regress/regress1/aufbv/Makefile.am index 4caeca8be..019e7f23a 100644 --- a/test/regress/regress1/aufbv/Makefile.am +++ b/test/regress/regress1/aufbv/Makefile.am @@ -17,7 +17,8 @@ endif # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - fuzz10.smt + fuzz10.smt \ + bug580.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/aufbv/bug580.smt2 b/test/regress/regress1/aufbv/bug580.smt2 similarity index 100% rename from test/regress/regress0/aufbv/bug580.smt2 rename to test/regress/regress1/aufbv/bug580.smt2 diff --git a/test/regress/regress1/auflia/Makefile.am b/test/regress/regress1/auflia/Makefile.am index a0824e570..25a0d89e0 100644 --- a/test/regress/regress1/auflia/Makefile.am +++ b/test/regress/regress1/auflia/Makefile.am @@ -19,7 +19,8 @@ endif TESTS = \ bug330.smt2 -EXTRA_DIST = $(TESTS) +EXTRA_DIST = $(TESTS) \ + bug337.smt2 # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress0/auflia/bug337.smt2 b/test/regress/regress1/auflia/bug337.smt2 similarity index 100% rename from test/regress/regress0/auflia/bug337.smt2 rename to test/regress/regress1/auflia/bug337.smt2 diff --git a/test/regress/regress0/boolean-terms-kernel2.smt2 b/test/regress/regress1/boolean-terms-kernel2.smt2 similarity index 100% rename from test/regress/regress0/boolean-terms-kernel2.smt2 rename to test/regress/regress1/boolean-terms-kernel2.smt2 diff --git a/test/regress/regress0/boolean.cvc b/test/regress/regress1/boolean.cvc similarity index 100% rename from test/regress/regress0/boolean.cvc rename to test/regress/regress1/boolean.cvc diff --git a/test/regress/regress0/bug216.smt2 b/test/regress/regress1/bug216.smt2 similarity index 100% rename from test/regress/regress0/bug216.smt2 rename to test/regress/regress1/bug216.smt2 diff --git a/test/regress/regress0/bug216.smt2.expect b/test/regress/regress1/bug216.smt2.expect similarity index 100% rename from test/regress/regress0/bug216.smt2.expect rename to test/regress/regress1/bug216.smt2.expect diff --git a/test/regress/regress0/bug296.smt2 b/test/regress/regress1/bug296.smt2 similarity index 100% rename from test/regress/regress0/bug296.smt2 rename to test/regress/regress1/bug296.smt2 diff --git a/test/regress/regress0/bug472.smt2 b/test/regress/regress1/bug472.smt2 similarity index 100% rename from test/regress/regress0/bug472.smt2 rename to test/regress/regress1/bug472.smt2 diff --git a/test/regress/regress0/bug507.smt2 b/test/regress/regress1/bug507.smt2 similarity index 100% rename from test/regress/regress0/bug507.smt2 rename to test/regress/regress1/bug507.smt2 diff --git a/test/regress/regress0/bug512.smt2 b/test/regress/regress1/bug512.smt2 similarity index 100% rename from test/regress/regress0/bug512.smt2 rename to test/regress/regress1/bug512.smt2 diff --git a/test/regress/regress0/bug516.smt2 b/test/regress/regress1/bug516.smt2 similarity index 100% rename from test/regress/regress0/bug516.smt2 rename to test/regress/regress1/bug516.smt2 diff --git a/test/regress/regress0/bug520.smt2 b/test/regress/regress1/bug520.smt2 similarity index 100% rename from test/regress/regress0/bug520.smt2 rename to test/regress/regress1/bug520.smt2 diff --git a/test/regress/regress0/bug543.smt2 b/test/regress/regress1/bug543.smt2 similarity index 100% rename from test/regress/regress0/bug543.smt2 rename to test/regress/regress1/bug543.smt2 diff --git a/test/regress/regress0/bug567.smt2 b/test/regress/regress1/bug567.smt2 similarity index 100% rename from test/regress/regress0/bug567.smt2 rename to test/regress/regress1/bug567.smt2 diff --git a/test/regress/regress0/bug585.cvc b/test/regress/regress1/bug585.cvc similarity index 100% rename from test/regress/regress0/bug585.cvc rename to test/regress/regress1/bug585.cvc diff --git a/test/regress/regress0/bug590.smt2 b/test/regress/regress1/bug590.smt2 similarity index 100% rename from test/regress/regress0/bug590.smt2 rename to test/regress/regress1/bug590.smt2 diff --git a/test/regress/regress0/bug590.smt2.expect b/test/regress/regress1/bug590.smt2.expect similarity index 100% rename from test/regress/regress0/bug590.smt2.expect rename to test/regress/regress1/bug590.smt2.expect diff --git a/test/regress/regress0/bug593.smt2 b/test/regress/regress1/bug593.smt2 similarity index 100% rename from test/regress/regress0/bug593.smt2 rename to test/regress/regress1/bug593.smt2 diff --git a/test/regress/regress0/bug681.smt2 b/test/regress/regress1/bug681.smt2 similarity index 100% rename from test/regress/regress0/bug681.smt2 rename to test/regress/regress1/bug681.smt2 diff --git a/test/regress/regress0/push-pop/bug694-Unapply1.scala-0.smt2 b/test/regress/regress1/bug694-Unapply1.scala-0.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug694-Unapply1.scala-0.smt2 rename to test/regress/regress1/bug694-Unapply1.scala-0.smt2 diff --git a/test/regress/regress0/uflra/bug800.smt2 b/test/regress/regress1/bug800.smt2 similarity index 100% rename from test/regress/regress0/uflra/bug800.smt2 rename to test/regress/regress1/bug800.smt2 diff --git a/test/regress/regress1/bv/Makefile.am b/test/regress/regress1/bv/Makefile.am index fa58e0dee..b144a0507 100644 --- a/test/regress/regress1/bv/Makefile.am +++ b/test/regress/regress1/bv/Makefile.am @@ -19,10 +19,22 @@ endif TESTS = \ bv-proof00.smt \ fuzz34.smt \ - fuzz38.smt + fuzz38.smt \ + bug_extract_mult_leading_bit.smt2 \ + bug787.smt2 \ + bv-int-collapse2-sat.smt2 \ + cmu-rdk-3.smt2 \ + decision-weight00.smt2 \ + divtest.smt2 \ + bv2nat-ground.smt2 \ + bv2nat-simp-range-sat.smt2 \ + unsound1.smt2 EXTRA_DIST = $(TESTS) +# This benchmark is currently disabled as it uses --check-proof +# bench_38.delta.smt2 + # synonyms for "check" in this directory .PHONY: regress regress1 test regress regress1 test: check diff --git a/test/regress/regress0/bv/bench_38.delta.smt2 b/test/regress/regress1/bv/bench_38.delta.smt2 similarity index 100% rename from test/regress/regress0/bv/bench_38.delta.smt2 rename to test/regress/regress1/bv/bench_38.delta.smt2 diff --git a/test/regress/regress0/bv/bug787.smt2 b/test/regress/regress1/bv/bug787.smt2 similarity index 100% rename from test/regress/regress0/bv/bug787.smt2 rename to test/regress/regress1/bv/bug787.smt2 diff --git a/test/regress/regress0/bv/bug_extract_mult_leading_bit.smt2 b/test/regress/regress1/bv/bug_extract_mult_leading_bit.smt2 similarity index 100% rename from test/regress/regress0/bv/bug_extract_mult_leading_bit.smt2 rename to test/regress/regress1/bv/bug_extract_mult_leading_bit.smt2 diff --git a/test/regress/regress0/bv/bv-int-collapse2-sat.smt2 b/test/regress/regress1/bv/bv-int-collapse2-sat.smt2 similarity index 100% rename from test/regress/regress0/bv/bv-int-collapse2-sat.smt2 rename to test/regress/regress1/bv/bv-int-collapse2-sat.smt2 diff --git a/test/regress/regress0/bv/bv2nat-ground.smt2 b/test/regress/regress1/bv/bv2nat-ground.smt2 similarity index 100% rename from test/regress/regress0/bv/bv2nat-ground.smt2 rename to test/regress/regress1/bv/bv2nat-ground.smt2 diff --git a/test/regress/regress0/bv/bv2nat-simp-range-sat.smt2 b/test/regress/regress1/bv/bv2nat-simp-range-sat.smt2 similarity index 100% rename from test/regress/regress0/bv/bv2nat-simp-range-sat.smt2 rename to test/regress/regress1/bv/bv2nat-simp-range-sat.smt2 diff --git a/test/regress/regress0/bv/cmu-rdk-3.smt2 b/test/regress/regress1/bv/cmu-rdk-3.smt2 similarity index 100% rename from test/regress/regress0/bv/cmu-rdk-3.smt2 rename to test/regress/regress1/bv/cmu-rdk-3.smt2 diff --git a/test/regress/regress0/bv/decision-weight00.smt2 b/test/regress/regress1/bv/decision-weight00.smt2 similarity index 96% rename from test/regress/regress0/bv/decision-weight00.smt2 rename to test/regress/regress1/bv/decision-weight00.smt2 index 1feb32c7f..be52810e0 100644 --- a/test/regress/regress0/bv/decision-weight00.smt2 +++ b/test/regress/regress1/bv/decision-weight00.smt2 @@ -1,5 +1,6 @@ (set-option :produce-models true) (set-logic QF_BV) +(set-info :status sat) (set-info :source | Patrice Godefroid, SAGE (systematic dynamic test generation) For more information: http://research.microsoft.com/en-us/um/people/pg/public_psfiles/ndss2008.pdf diff --git a/test/regress/regress0/bv/divtest.smt2 b/test/regress/regress1/bv/divtest.smt2 similarity index 100% rename from test/regress/regress0/bv/divtest.smt2 rename to test/regress/regress1/bv/divtest.smt2 diff --git a/test/regress/regress0/bv/unsound1.smt2 b/test/regress/regress1/bv/unsound1.smt2 similarity index 100% rename from test/regress/regress0/bv/unsound1.smt2 rename to test/regress/regress1/bv/unsound1.smt2 diff --git a/test/regress/regress0/unconstrained/bvdiv2.smt2 b/test/regress/regress1/bvdiv2.smt2 similarity index 100% rename from test/regress/regress0/unconstrained/bvdiv2.smt2 rename to test/regress/regress1/bvdiv2.smt2 diff --git a/test/regress/regress0/arrays/constarr3.cvc b/test/regress/regress1/constarr3.cvc similarity index 100% rename from test/regress/regress0/arrays/constarr3.cvc rename to test/regress/regress1/constarr3.cvc diff --git a/test/regress/regress0/arrays/constarr3.smt2 b/test/regress/regress1/constarr3.smt2 similarity index 100% rename from test/regress/regress0/arrays/constarr3.smt2 rename to test/regress/regress1/constarr3.smt2 diff --git a/test/regress/regress0/crash_burn_locusts.smt2 b/test/regress/regress1/crash_burn_locusts.smt2 similarity index 100% rename from test/regress/regress0/crash_burn_locusts.smt2 rename to test/regress/regress1/crash_burn_locusts.smt2 diff --git a/test/regress/regress1/datatypes/Makefile.am b/test/regress/regress1/datatypes/Makefile.am index a9d13f763..036b8df00 100644 --- a/test/regress/regress1/datatypes/Makefile.am +++ b/test/regress/regress1/datatypes/Makefile.am @@ -17,7 +17,11 @@ endif # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - manos-model.smt2 + manos-model.smt2 \ + acyclicity-sr-ground096.smt2 \ + dt-color-2.6.smt2 \ + dt-param-card4-unsat.smt2 \ + error.cvc EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/datatypes/acyclicity-sr-ground096.smt2 b/test/regress/regress1/datatypes/acyclicity-sr-ground096.smt2 similarity index 100% rename from test/regress/regress0/datatypes/acyclicity-sr-ground096.smt2 rename to test/regress/regress1/datatypes/acyclicity-sr-ground096.smt2 diff --git a/test/regress/regress0/datatypes/dt-color-2.6.smt2 b/test/regress/regress1/datatypes/dt-color-2.6.smt2 similarity index 100% rename from test/regress/regress0/datatypes/dt-color-2.6.smt2 rename to test/regress/regress1/datatypes/dt-color-2.6.smt2 diff --git a/test/regress/regress0/datatypes/dt-param-card4-unsat.smt2 b/test/regress/regress1/datatypes/dt-param-card4-unsat.smt2 similarity index 100% rename from test/regress/regress0/datatypes/dt-param-card4-unsat.smt2 rename to test/regress/regress1/datatypes/dt-param-card4-unsat.smt2 diff --git a/test/regress/regress0/datatypes/error.cvc b/test/regress/regress1/datatypes/error.cvc similarity index 100% rename from test/regress/regress0/datatypes/error.cvc rename to test/regress/regress1/datatypes/error.cvc diff --git a/test/regress/regress1/decision/Makefile.am b/test/regress/regress1/decision/Makefile.am index 8317536c6..102c99e01 100644 --- a/test/regress/regress1/decision/Makefile.am +++ b/test/regress/regress1/decision/Makefile.am @@ -17,9 +17,13 @@ endif # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - error3.smt + error3.smt \ + quant-symmetric_unsat_7.smt2 \ + quant-Arrays_Q1-noinfer.smt2 -EXTRA_DIST = $(TESTS) +EXTRA_DIST = $(TESTS) \ + quant-symmetric_unsat_7.smt2.expect \ + quant-Arrays_Q1-noinfer.smt2.expect # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress0/decision/quant-Arrays_Q1-noinfer.smt2 b/test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2 similarity index 100% rename from test/regress/regress0/decision/quant-Arrays_Q1-noinfer.smt2 rename to test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2 diff --git a/test/regress/regress0/decision/quant-Arrays_Q1-noinfer.smt2.expect b/test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2.expect similarity index 100% rename from test/regress/regress0/decision/quant-Arrays_Q1-noinfer.smt2.expect rename to test/regress/regress1/decision/quant-Arrays_Q1-noinfer.smt2.expect diff --git a/test/regress/regress0/decision/quant-symmetric_unsat_7.smt2 b/test/regress/regress1/decision/quant-symmetric_unsat_7.smt2 similarity index 100% rename from test/regress/regress0/decision/quant-symmetric_unsat_7.smt2 rename to test/regress/regress1/decision/quant-symmetric_unsat_7.smt2 diff --git a/test/regress/regress0/decision/quant-symmetric_unsat_7.smt2.expect b/test/regress/regress1/decision/quant-symmetric_unsat_7.smt2.expect similarity index 100% rename from test/regress/regress0/decision/quant-symmetric_unsat_7.smt2.expect rename to test/regress/regress1/decision/quant-symmetric_unsat_7.smt2.expect diff --git a/test/regress/regress0/error.cvc b/test/regress/regress1/error.cvc similarity index 100% rename from test/regress/regress0/error.cvc rename to test/regress/regress1/error.cvc diff --git a/test/regress/regress0/errorcrash.smt2 b/test/regress/regress1/errorcrash.smt2 similarity index 100% rename from test/regress/regress0/errorcrash.smt2 rename to test/regress/regress1/errorcrash.smt2 diff --git a/test/regress/regress0/push-pop/fmf-fun-dbu.smt2 b/test/regress/regress1/fmf-fun-dbu.smt2 similarity index 100% rename from test/regress/regress0/push-pop/fmf-fun-dbu.smt2 rename to test/regress/regress1/fmf-fun-dbu.smt2 diff --git a/test/regress/regress0/fmf/ALG008-1.smt2 b/test/regress/regress1/fmf/ALG008-1.smt2 similarity index 100% rename from test/regress/regress0/fmf/ALG008-1.smt2 rename to test/regress/regress1/fmf/ALG008-1.smt2 diff --git a/test/regress/regress0/fmf/LeftistHeap.scala-8-ncm.smt2 b/test/regress/regress1/fmf/LeftistHeap.scala-8-ncm.smt2 similarity index 100% rename from test/regress/regress0/fmf/LeftistHeap.scala-8-ncm.smt2 rename to test/regress/regress1/fmf/LeftistHeap.scala-8-ncm.smt2 diff --git a/test/regress/regress1/fmf/Makefile.am b/test/regress/regress1/fmf/Makefile.am index efaf535c6..dc07f6ca4 100644 --- a/test/regress/regress1/fmf/Makefile.am +++ b/test/regress/regress1/fmf/Makefile.am @@ -17,8 +17,45 @@ endif # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - ForElimination-scala-9.smt2 \ - nunchaku2309663.nun.min.smt2 + agree466.smt2 \ + ALG008-1.smt2 \ + bug0909.smt2 \ + bug764.smt2 \ + datatypes-ufinite.smt2 \ + datatypes-ufinite-nested.smt2 \ + fc-pigeonhole19.smt2 \ + fib-core.smt2 \ + fmf-bound-2dim.smt2 \ + fmf-fun-no-elim-ext-arith2.smt2 \ + fmf-strange-bounds.smt2 \ + issue916-fmf-or.smt2 \ + jasmin-cdt-crash.smt2 \ + LeftistHeap.scala-8-ncm.smt2 \ + lst-no-self-rev-exp.smt2 \ + nun-0208-to.smt2 \ + pow2-bool.smt2 \ + with-ind-104-core.smt2 \ + agree467.smt2 \ + alg202+1.smt2 \ + am-bad-model.cvc \ + bound-int-alt.smt2 \ + bug651.smt2 \ + bug723-irrelevant-funs.smt2 \ + cons-sets-bounds.smt2 \ + constr-ground-to.smt2 \ + dt-proper-model.smt2 \ + fmf-bound-int.smt2 \ + fmf-fun-no-elim-ext-arith.smt2 \ + forall_unit_data.smt2 \ + fore19-exp2-core.smt2 \ + german169.smt2 \ + german73.smt2 \ + ko-bound-set.cvc \ + loopy_coda.smt2 \ + memory_model-R_cpp-dd.cvc \ + PUZ001+1.smt2 \ + refcount24.cvc.smt2 \ + sc-crash-052316.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/fmf/PUZ001+1.smt2 b/test/regress/regress1/fmf/PUZ001+1.smt2 similarity index 100% rename from test/regress/regress0/fmf/PUZ001+1.smt2 rename to test/regress/regress1/fmf/PUZ001+1.smt2 diff --git a/test/regress/regress0/fmf/agree466.smt2 b/test/regress/regress1/fmf/agree466.smt2 similarity index 100% rename from test/regress/regress0/fmf/agree466.smt2 rename to test/regress/regress1/fmf/agree466.smt2 diff --git a/test/regress/regress0/fmf/agree467.smt2 b/test/regress/regress1/fmf/agree467.smt2 similarity index 100% rename from test/regress/regress0/fmf/agree467.smt2 rename to test/regress/regress1/fmf/agree467.smt2 diff --git a/test/regress/regress0/fmf/alg202+1.smt2 b/test/regress/regress1/fmf/alg202+1.smt2 similarity index 100% rename from test/regress/regress0/fmf/alg202+1.smt2 rename to test/regress/regress1/fmf/alg202+1.smt2 diff --git a/test/regress/regress0/fmf/am-bad-model.cvc b/test/regress/regress1/fmf/am-bad-model.cvc similarity index 100% rename from test/regress/regress0/fmf/am-bad-model.cvc rename to test/regress/regress1/fmf/am-bad-model.cvc diff --git a/test/regress/regress0/fmf/bound-int-alt.smt2 b/test/regress/regress1/fmf/bound-int-alt.smt2 similarity index 100% rename from test/regress/regress0/fmf/bound-int-alt.smt2 rename to test/regress/regress1/fmf/bound-int-alt.smt2 diff --git a/test/regress/regress0/fmf/bug0909.smt2 b/test/regress/regress1/fmf/bug0909.smt2 similarity index 100% rename from test/regress/regress0/fmf/bug0909.smt2 rename to test/regress/regress1/fmf/bug0909.smt2 diff --git a/test/regress/regress0/fmf/bug651.smt2 b/test/regress/regress1/fmf/bug651.smt2 similarity index 100% rename from test/regress/regress0/fmf/bug651.smt2 rename to test/regress/regress1/fmf/bug651.smt2 diff --git a/test/regress/regress0/fmf/bug723-irrelevant-funs.smt2 b/test/regress/regress1/fmf/bug723-irrelevant-funs.smt2 similarity index 100% rename from test/regress/regress0/fmf/bug723-irrelevant-funs.smt2 rename to test/regress/regress1/fmf/bug723-irrelevant-funs.smt2 diff --git a/test/regress/regress0/fmf/bug764.smt2 b/test/regress/regress1/fmf/bug764.smt2 similarity index 100% rename from test/regress/regress0/fmf/bug764.smt2 rename to test/regress/regress1/fmf/bug764.smt2 diff --git a/test/regress/regress0/fmf/cons-sets-bounds.smt2 b/test/regress/regress1/fmf/cons-sets-bounds.smt2 similarity index 100% rename from test/regress/regress0/fmf/cons-sets-bounds.smt2 rename to test/regress/regress1/fmf/cons-sets-bounds.smt2 diff --git a/test/regress/regress0/fmf/constr-ground-to.smt2 b/test/regress/regress1/fmf/constr-ground-to.smt2 similarity index 100% rename from test/regress/regress0/fmf/constr-ground-to.smt2 rename to test/regress/regress1/fmf/constr-ground-to.smt2 diff --git a/test/regress/regress0/fmf/datatypes-ufinite-nested.smt2 b/test/regress/regress1/fmf/datatypes-ufinite-nested.smt2 similarity index 100% rename from test/regress/regress0/fmf/datatypes-ufinite-nested.smt2 rename to test/regress/regress1/fmf/datatypes-ufinite-nested.smt2 diff --git a/test/regress/regress0/fmf/datatypes-ufinite.smt2 b/test/regress/regress1/fmf/datatypes-ufinite.smt2 similarity index 100% rename from test/regress/regress0/fmf/datatypes-ufinite.smt2 rename to test/regress/regress1/fmf/datatypes-ufinite.smt2 diff --git a/test/regress/regress0/fmf/dt-proper-model.smt2 b/test/regress/regress1/fmf/dt-proper-model.smt2 similarity index 100% rename from test/regress/regress0/fmf/dt-proper-model.smt2 rename to test/regress/regress1/fmf/dt-proper-model.smt2 diff --git a/test/regress/regress0/fmf/fc-pigeonhole19.smt2 b/test/regress/regress1/fmf/fc-pigeonhole19.smt2 similarity index 100% rename from test/regress/regress0/fmf/fc-pigeonhole19.smt2 rename to test/regress/regress1/fmf/fc-pigeonhole19.smt2 diff --git a/test/regress/regress0/fmf/fib-core.smt2 b/test/regress/regress1/fmf/fib-core.smt2 similarity index 100% rename from test/regress/regress0/fmf/fib-core.smt2 rename to test/regress/regress1/fmf/fib-core.smt2 diff --git a/test/regress/regress0/fmf/fmf-bound-2dim.smt2 b/test/regress/regress1/fmf/fmf-bound-2dim.smt2 similarity index 100% rename from test/regress/regress0/fmf/fmf-bound-2dim.smt2 rename to test/regress/regress1/fmf/fmf-bound-2dim.smt2 diff --git a/test/regress/regress0/fmf/fmf-bound-int.smt2 b/test/regress/regress1/fmf/fmf-bound-int.smt2 similarity index 100% rename from test/regress/regress0/fmf/fmf-bound-int.smt2 rename to test/regress/regress1/fmf/fmf-bound-int.smt2 diff --git a/test/regress/regress0/fmf/fmf-fun-no-elim-ext-arith.smt2 b/test/regress/regress1/fmf/fmf-fun-no-elim-ext-arith.smt2 similarity index 100% rename from test/regress/regress0/fmf/fmf-fun-no-elim-ext-arith.smt2 rename to test/regress/regress1/fmf/fmf-fun-no-elim-ext-arith.smt2 diff --git a/test/regress/regress0/fmf/fmf-fun-no-elim-ext-arith2.smt2 b/test/regress/regress1/fmf/fmf-fun-no-elim-ext-arith2.smt2 similarity index 100% rename from test/regress/regress0/fmf/fmf-fun-no-elim-ext-arith2.smt2 rename to test/regress/regress1/fmf/fmf-fun-no-elim-ext-arith2.smt2 diff --git a/test/regress/regress0/fmf/fmf-strange-bounds.smt2 b/test/regress/regress1/fmf/fmf-strange-bounds.smt2 similarity index 100% rename from test/regress/regress0/fmf/fmf-strange-bounds.smt2 rename to test/regress/regress1/fmf/fmf-strange-bounds.smt2 diff --git a/test/regress/regress0/fmf/forall_unit_data.smt2 b/test/regress/regress1/fmf/forall_unit_data.smt2 similarity index 82% rename from test/regress/regress0/fmf/forall_unit_data.smt2 rename to test/regress/regress1/fmf/forall_unit_data.smt2 index 26ef66522..6971c4d0a 100644 --- a/test/regress/regress0/fmf/forall_unit_data.smt2 +++ b/test/regress/regress1/fmf/forall_unit_data.smt2 @@ -1,4 +1,4 @@ -; COMMAND-LINE: --finite-model-find +; COMMAND-LINE: --finite-model-find --lang=smt2.5 ; EXPECT: sat (set-option :produce-models true) (set-option :interactive-mode true) diff --git a/test/regress/regress0/fmf/fore19-exp2-core.smt2 b/test/regress/regress1/fmf/fore19-exp2-core.smt2 similarity index 100% rename from test/regress/regress0/fmf/fore19-exp2-core.smt2 rename to test/regress/regress1/fmf/fore19-exp2-core.smt2 diff --git a/test/regress/regress0/fmf/german169.smt2 b/test/regress/regress1/fmf/german169.smt2 similarity index 100% rename from test/regress/regress0/fmf/german169.smt2 rename to test/regress/regress1/fmf/german169.smt2 diff --git a/test/regress/regress0/fmf/german73.smt2 b/test/regress/regress1/fmf/german73.smt2 similarity index 100% rename from test/regress/regress0/fmf/german73.smt2 rename to test/regress/regress1/fmf/german73.smt2 diff --git a/test/regress/regress0/fmf/issue916-fmf-or.smt2 b/test/regress/regress1/fmf/issue916-fmf-or.smt2 similarity index 100% rename from test/regress/regress0/fmf/issue916-fmf-or.smt2 rename to test/regress/regress1/fmf/issue916-fmf-or.smt2 diff --git a/test/regress/regress0/fmf/jasmin-cdt-crash.smt2 b/test/regress/regress1/fmf/jasmin-cdt-crash.smt2 similarity index 100% rename from test/regress/regress0/fmf/jasmin-cdt-crash.smt2 rename to test/regress/regress1/fmf/jasmin-cdt-crash.smt2 diff --git a/test/regress/regress0/fmf/ko-bound-set.cvc b/test/regress/regress1/fmf/ko-bound-set.cvc similarity index 100% rename from test/regress/regress0/fmf/ko-bound-set.cvc rename to test/regress/regress1/fmf/ko-bound-set.cvc diff --git a/test/regress/regress0/fmf/loopy_coda.smt2 b/test/regress/regress1/fmf/loopy_coda.smt2 similarity index 100% rename from test/regress/regress0/fmf/loopy_coda.smt2 rename to test/regress/regress1/fmf/loopy_coda.smt2 diff --git a/test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 b/test/regress/regress1/fmf/lst-no-self-rev-exp.smt2 similarity index 100% rename from test/regress/regress0/fmf/lst-no-self-rev-exp.smt2 rename to test/regress/regress1/fmf/lst-no-self-rev-exp.smt2 diff --git a/test/regress/regress0/fmf/memory_model-R_cpp-dd.cvc b/test/regress/regress1/fmf/memory_model-R_cpp-dd.cvc similarity index 100% rename from test/regress/regress0/fmf/memory_model-R_cpp-dd.cvc rename to test/regress/regress1/fmf/memory_model-R_cpp-dd.cvc diff --git a/test/regress/regress0/fmf/nun-0208-to.smt2 b/test/regress/regress1/fmf/nun-0208-to.smt2 similarity index 100% rename from test/regress/regress0/fmf/nun-0208-to.smt2 rename to test/regress/regress1/fmf/nun-0208-to.smt2 diff --git a/test/regress/regress0/fmf/pow2-bool.smt2 b/test/regress/regress1/fmf/pow2-bool.smt2 similarity index 100% rename from test/regress/regress0/fmf/pow2-bool.smt2 rename to test/regress/regress1/fmf/pow2-bool.smt2 diff --git a/test/regress/regress0/fmf/refcount24.cvc.smt2 b/test/regress/regress1/fmf/refcount24.cvc.smt2 similarity index 100% rename from test/regress/regress0/fmf/refcount24.cvc.smt2 rename to test/regress/regress1/fmf/refcount24.cvc.smt2 diff --git a/test/regress/regress0/fmf/sc-crash-052316.smt2 b/test/regress/regress1/fmf/sc-crash-052316.smt2 similarity index 100% rename from test/regress/regress0/fmf/sc-crash-052316.smt2 rename to test/regress/regress1/fmf/sc-crash-052316.smt2 diff --git a/test/regress/regress0/fmf/with-ind-104-core.smt2 b/test/regress/regress1/fmf/with-ind-104-core.smt2 similarity index 100% rename from test/regress/regress0/fmf/with-ind-104-core.smt2 rename to test/regress/regress1/fmf/with-ind-104-core.smt2 diff --git a/test/regress/regress0/uf/gensys_brn001.smt2 b/test/regress/regress1/gensys_brn001.smt2 similarity index 100% rename from test/regress/regress0/uf/gensys_brn001.smt2 rename to test/regress/regress1/gensys_brn001.smt2 diff --git a/test/regress/regress1/ho/Makefile.am b/test/regress/regress1/ho/Makefile.am new file mode 100644 index 000000000..6ae3a116f --- /dev/null +++ b/test/regress/regress1/ho/Makefile.am @@ -0,0 +1,35 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + auth0068.smt2 \ + fta0409.smt2 \ + ho-exponential-model.smt2 \ + ho-matching-enum-2.smt2 \ + ho-std-fmf.smt2 + +EXTRA_DIST = $(TESTS) \ + hoa0102.smt2 + +# synonyms for "check" in this directory +.PHONY: regress regress1 test +regress regress1 test: check + +# do nothing in this subdir +.PHONY: regress0 regress2 regress3 regress4 +regress0 regress2 regress3 regress4: diff --git a/test/regress/regress0/ho/auth0068.smt2 b/test/regress/regress1/ho/auth0068.smt2 similarity index 100% rename from test/regress/regress0/ho/auth0068.smt2 rename to test/regress/regress1/ho/auth0068.smt2 diff --git a/test/regress/regress0/ho/fta0409.smt2 b/test/regress/regress1/ho/fta0409.smt2 similarity index 100% rename from test/regress/regress0/ho/fta0409.smt2 rename to test/regress/regress1/ho/fta0409.smt2 diff --git a/test/regress/regress0/ho/ho-exponential-model.smt2 b/test/regress/regress1/ho/ho-exponential-model.smt2 similarity index 100% rename from test/regress/regress0/ho/ho-exponential-model.smt2 rename to test/regress/regress1/ho/ho-exponential-model.smt2 diff --git a/test/regress/regress0/ho/ho-matching-enum-2.smt2 b/test/regress/regress1/ho/ho-matching-enum-2.smt2 similarity index 100% rename from test/regress/regress0/ho/ho-matching-enum-2.smt2 rename to test/regress/regress1/ho/ho-matching-enum-2.smt2 diff --git a/test/regress/regress0/ho/ho-std-fmf.smt2 b/test/regress/regress1/ho/ho-std-fmf.smt2 similarity index 100% rename from test/regress/regress0/ho/ho-std-fmf.smt2 rename to test/regress/regress1/ho/ho-std-fmf.smt2 diff --git a/test/regress/regress0/ho/hoa0102.smt2 b/test/regress/regress1/ho/hoa0102.smt2 similarity index 100% rename from test/regress/regress0/ho/hoa0102.smt2 rename to test/regress/regress1/ho/hoa0102.smt2 diff --git a/test/regress/regress0/hole6.cvc b/test/regress/regress1/hole6.cvc similarity index 100% rename from test/regress/regress0/hole6.cvc rename to test/regress/regress1/hole6.cvc diff --git a/test/regress/regress0/issue1048-arrays-int-real.smt2 b/test/regress/regress1/issue1048-arrays-int-real.smt2 similarity index 100% rename from test/regress/regress0/issue1048-arrays-int-real.smt2 rename to test/regress/regress1/issue1048-arrays-int-real.smt2 diff --git a/test/regress/regress0/ite5.smt2 b/test/regress/regress1/ite5.smt2 similarity index 100% rename from test/regress/regress0/ite5.smt2 rename to test/regress/regress1/ite5.smt2 diff --git a/test/regress/regress1/nl/Makefile.am b/test/regress/regress1/nl/Makefile.am index a7e4c1411..bafaf665a 100644 --- a/test/regress/regress1/nl/Makefile.am +++ b/test/regress/regress1/nl/Makefile.am @@ -17,8 +17,53 @@ endif # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - siegel-nl-bases.smt2 \ - mirko-050417.smt2 + mirko-050417.smt2 \ + arrowsmith-050317.smt2 \ + bug698.smt2 \ + dist-big.smt2 \ + dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 \ + exp-4.5-lt.smt2 \ + metitarski_3_4_2e.smt2 \ + metitarski-3-4.smt2 \ + nl-help-unsat-quant.smt2 \ + poly-1025.smt2 \ + quant-nl.smt2 \ + red-exp.smt2 \ + rewriting-sums.smt2 \ + simple-mono.smt2 \ + sin1-sat.smt2 \ + sin-compare.smt2 \ + sin-compare-across-phase.smt2 \ + sqrt-problem-1.smt2 \ + sugar-ident-2.smt2 \ + sugar-ident-3.smt2 \ + tan-rewrite2.smt2 \ + bad-050217.smt2 \ + coeff-unsat-base.smt2 \ + coeff-unsat.smt2 \ + combine.smt2 \ + cos-bound.smt2 \ + cos1-tc.smt2 \ + disj-eval.smt2 \ + div-mod-partial.smt2 \ + exp_monotone.smt2 \ + exp1-lb.smt2 \ + metitarski-1025.smt2 \ + NAVIGATION2.smt2 \ + nl-unk-quant.smt2 \ + ones.smt2 \ + shifting.smt2 \ + shifting2.smt2 \ + simple-mono-unsat.smt2 \ + sin-init-tangents.smt2 \ + sin-sign.smt2 \ + sin-sym2.smt2 \ + sin1-lb.smt2 \ + sin1-ub.smt2 \ + sin2-lb.smt2 \ + sin2-ub.smt2 \ + sugar-ident.smt2 \ + zero-subset.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/nl/nta/NAVIGATION2.smt2 b/test/regress/regress1/nl/NAVIGATION2.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/NAVIGATION2.smt2 rename to test/regress/regress1/nl/NAVIGATION2.smt2 diff --git a/test/regress/regress0/nl/nta/arrowsmith-050317.smt2 b/test/regress/regress1/nl/arrowsmith-050317.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/arrowsmith-050317.smt2 rename to test/regress/regress1/nl/arrowsmith-050317.smt2 diff --git a/test/regress/regress0/nl/nta/bad-050217.smt2 b/test/regress/regress1/nl/bad-050217.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/bad-050217.smt2 rename to test/regress/regress1/nl/bad-050217.smt2 diff --git a/test/regress/regress0/nl/bug698.smt2 b/test/regress/regress1/nl/bug698.smt2 similarity index 100% rename from test/regress/regress0/nl/bug698.smt2 rename to test/regress/regress1/nl/bug698.smt2 diff --git a/test/regress/regress0/nl/coeff-unsat-base.smt2 b/test/regress/regress1/nl/coeff-unsat-base.smt2 similarity index 100% rename from test/regress/regress0/nl/coeff-unsat-base.smt2 rename to test/regress/regress1/nl/coeff-unsat-base.smt2 diff --git a/test/regress/regress0/nl/coeff-unsat.smt2 b/test/regress/regress1/nl/coeff-unsat.smt2 similarity index 100% rename from test/regress/regress0/nl/coeff-unsat.smt2 rename to test/regress/regress1/nl/coeff-unsat.smt2 diff --git a/test/regress/regress0/nl/combine.smt2 b/test/regress/regress1/nl/combine.smt2 similarity index 100% rename from test/regress/regress0/nl/combine.smt2 rename to test/regress/regress1/nl/combine.smt2 diff --git a/test/regress/regress0/nl/nta/cos-bound.smt2 b/test/regress/regress1/nl/cos-bound.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/cos-bound.smt2 rename to test/regress/regress1/nl/cos-bound.smt2 diff --git a/test/regress/regress0/nl/nta/cos1-tc.smt2 b/test/regress/regress1/nl/cos1-tc.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/cos1-tc.smt2 rename to test/regress/regress1/nl/cos1-tc.smt2 diff --git a/test/regress/regress0/nl/disj-eval.smt2 b/test/regress/regress1/nl/disj-eval.smt2 similarity index 100% rename from test/regress/regress0/nl/disj-eval.smt2 rename to test/regress/regress1/nl/disj-eval.smt2 diff --git a/test/regress/regress0/nl/dist-big.smt2 b/test/regress/regress1/nl/dist-big.smt2 similarity index 100% rename from test/regress/regress0/nl/dist-big.smt2 rename to test/regress/regress1/nl/dist-big.smt2 diff --git a/test/regress/regress0/nl/div-mod-partial.smt2 b/test/regress/regress1/nl/div-mod-partial.smt2 similarity index 100% rename from test/regress/regress0/nl/div-mod-partial.smt2 rename to test/regress/regress1/nl/div-mod-partial.smt2 diff --git a/test/regress/regress0/nl/nta/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 b/test/regress/regress1/nl/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 rename to test/regress/regress1/nl/dumortier_llibre_artes_ex_5_13.transcendental.k2.smt2 diff --git a/test/regress/regress0/nl/nta/exp-4.5-lt.smt2 b/test/regress/regress1/nl/exp-4.5-lt.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/exp-4.5-lt.smt2 rename to test/regress/regress1/nl/exp-4.5-lt.smt2 diff --git a/test/regress/regress0/nl/nta/exp1-lb.smt2 b/test/regress/regress1/nl/exp1-lb.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/exp1-lb.smt2 rename to test/regress/regress1/nl/exp1-lb.smt2 diff --git a/test/regress/regress0/nl/nta/exp_monotone.smt2 b/test/regress/regress1/nl/exp_monotone.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/exp_monotone.smt2 rename to test/regress/regress1/nl/exp_monotone.smt2 diff --git a/test/regress/regress0/nl/metitarski-1025.smt2 b/test/regress/regress1/nl/metitarski-1025.smt2 similarity index 100% rename from test/regress/regress0/nl/metitarski-1025.smt2 rename to test/regress/regress1/nl/metitarski-1025.smt2 diff --git a/test/regress/regress0/nl/metitarski-3-4.smt2 b/test/regress/regress1/nl/metitarski-3-4.smt2 similarity index 100% rename from test/regress/regress0/nl/metitarski-3-4.smt2 rename to test/regress/regress1/nl/metitarski-3-4.smt2 diff --git a/test/regress/regress0/nl/metitarski_3_4_2e.smt2 b/test/regress/regress1/nl/metitarski_3_4_2e.smt2 similarity index 100% rename from test/regress/regress0/nl/metitarski_3_4_2e.smt2 rename to test/regress/regress1/nl/metitarski_3_4_2e.smt2 diff --git a/test/regress/regress0/nl/nl-help-unsat-quant.smt2 b/test/regress/regress1/nl/nl-help-unsat-quant.smt2 similarity index 100% rename from test/regress/regress0/nl/nl-help-unsat-quant.smt2 rename to test/regress/regress1/nl/nl-help-unsat-quant.smt2 diff --git a/test/regress/regress0/nl/nl-unk-quant.smt2 b/test/regress/regress1/nl/nl-unk-quant.smt2 similarity index 100% rename from test/regress/regress0/nl/nl-unk-quant.smt2 rename to test/regress/regress1/nl/nl-unk-quant.smt2 diff --git a/test/regress/regress0/nl/ones.smt2 b/test/regress/regress1/nl/ones.smt2 similarity index 100% rename from test/regress/regress0/nl/ones.smt2 rename to test/regress/regress1/nl/ones.smt2 diff --git a/test/regress/regress0/nl/poly-1025.smt2 b/test/regress/regress1/nl/poly-1025.smt2 similarity index 100% rename from test/regress/regress0/nl/poly-1025.smt2 rename to test/regress/regress1/nl/poly-1025.smt2 diff --git a/test/regress/regress0/nl/quant-nl.smt2 b/test/regress/regress1/nl/quant-nl.smt2 similarity index 100% rename from test/regress/regress0/nl/quant-nl.smt2 rename to test/regress/regress1/nl/quant-nl.smt2 diff --git a/test/regress/regress0/nl/red-exp.smt2 b/test/regress/regress1/nl/red-exp.smt2 similarity index 100% rename from test/regress/regress0/nl/red-exp.smt2 rename to test/regress/regress1/nl/red-exp.smt2 diff --git a/test/regress/regress0/nl/rewriting-sums.smt2 b/test/regress/regress1/nl/rewriting-sums.smt2 similarity index 100% rename from test/regress/regress0/nl/rewriting-sums.smt2 rename to test/regress/regress1/nl/rewriting-sums.smt2 diff --git a/test/regress/regress0/nl/nta/shifting.smt2 b/test/regress/regress1/nl/shifting.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/shifting.smt2 rename to test/regress/regress1/nl/shifting.smt2 diff --git a/test/regress/regress0/nl/nta/shifting2.smt2 b/test/regress/regress1/nl/shifting2.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/shifting2.smt2 rename to test/regress/regress1/nl/shifting2.smt2 diff --git a/test/regress/regress0/nl/simple-mono-unsat.smt2 b/test/regress/regress1/nl/simple-mono-unsat.smt2 similarity index 100% rename from test/regress/regress0/nl/simple-mono-unsat.smt2 rename to test/regress/regress1/nl/simple-mono-unsat.smt2 diff --git a/test/regress/regress0/nl/simple-mono.smt2 b/test/regress/regress1/nl/simple-mono.smt2 similarity index 100% rename from test/regress/regress0/nl/simple-mono.smt2 rename to test/regress/regress1/nl/simple-mono.smt2 diff --git a/test/regress/regress0/nl/nta/sin-compare-across-phase.smt2 b/test/regress/regress1/nl/sin-compare-across-phase.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin-compare-across-phase.smt2 rename to test/regress/regress1/nl/sin-compare-across-phase.smt2 diff --git a/test/regress/regress0/nl/nta/sin-compare.smt2 b/test/regress/regress1/nl/sin-compare.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin-compare.smt2 rename to test/regress/regress1/nl/sin-compare.smt2 diff --git a/test/regress/regress0/nl/nta/sin-init-tangents.smt2 b/test/regress/regress1/nl/sin-init-tangents.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin-init-tangents.smt2 rename to test/regress/regress1/nl/sin-init-tangents.smt2 diff --git a/test/regress/regress0/nl/nta/sin-sign.smt2 b/test/regress/regress1/nl/sin-sign.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin-sign.smt2 rename to test/regress/regress1/nl/sin-sign.smt2 diff --git a/test/regress/regress0/nl/nta/sin-sym2.smt2 b/test/regress/regress1/nl/sin-sym2.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin-sym2.smt2 rename to test/regress/regress1/nl/sin-sym2.smt2 diff --git a/test/regress/regress0/nl/nta/sin1-lb.smt2 b/test/regress/regress1/nl/sin1-lb.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin1-lb.smt2 rename to test/regress/regress1/nl/sin1-lb.smt2 diff --git a/test/regress/regress0/nl/nta/sin1-sat.smt2 b/test/regress/regress1/nl/sin1-sat.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin1-sat.smt2 rename to test/regress/regress1/nl/sin1-sat.smt2 diff --git a/test/regress/regress0/nl/nta/sin1-ub.smt2 b/test/regress/regress1/nl/sin1-ub.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin1-ub.smt2 rename to test/regress/regress1/nl/sin1-ub.smt2 diff --git a/test/regress/regress0/nl/nta/sin2-lb.smt2 b/test/regress/regress1/nl/sin2-lb.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin2-lb.smt2 rename to test/regress/regress1/nl/sin2-lb.smt2 diff --git a/test/regress/regress0/nl/nta/sin2-ub.smt2 b/test/regress/regress1/nl/sin2-ub.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sin2-ub.smt2 rename to test/regress/regress1/nl/sin2-ub.smt2 diff --git a/test/regress/regress0/nl/sqrt-problem-1.smt2 b/test/regress/regress1/nl/sqrt-problem-1.smt2 similarity index 100% rename from test/regress/regress0/nl/sqrt-problem-1.smt2 rename to test/regress/regress1/nl/sqrt-problem-1.smt2 diff --git a/test/regress/regress0/nl/nta/sugar-ident-2.smt2 b/test/regress/regress1/nl/sugar-ident-2.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sugar-ident-2.smt2 rename to test/regress/regress1/nl/sugar-ident-2.smt2 diff --git a/test/regress/regress0/nl/nta/sugar-ident-3.smt2 b/test/regress/regress1/nl/sugar-ident-3.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sugar-ident-3.smt2 rename to test/regress/regress1/nl/sugar-ident-3.smt2 diff --git a/test/regress/regress0/nl/nta/sugar-ident.smt2 b/test/regress/regress1/nl/sugar-ident.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/sugar-ident.smt2 rename to test/regress/regress1/nl/sugar-ident.smt2 diff --git a/test/regress/regress0/nl/nta/tan-rewrite2.smt2 b/test/regress/regress1/nl/tan-rewrite2.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/tan-rewrite2.smt2 rename to test/regress/regress1/nl/tan-rewrite2.smt2 diff --git a/test/regress/regress0/nl/zero-subset.smt2 b/test/regress/regress1/nl/zero-subset.smt2 similarity index 100% rename from test/regress/regress0/nl/zero-subset.smt2 rename to test/regress/regress1/nl/zero-subset.smt2 diff --git a/test/regress/regress0/non-fatal-errors.smt2 b/test/regress/regress1/non-fatal-errors.smt2 similarity index 100% rename from test/regress/regress0/non-fatal-errors.smt2 rename to test/regress/regress1/non-fatal-errors.smt2 diff --git a/test/regress/regress0/arrays/parsing_ringer.cvc b/test/regress/regress1/parsing_ringer.cvc similarity index 100% rename from test/regress/regress0/arrays/parsing_ringer.cvc rename to test/regress/regress1/parsing_ringer.cvc diff --git a/test/regress/regress0/uf/proof00.smt2 b/test/regress/regress1/proof00.smt2 similarity index 100% rename from test/regress/regress0/uf/proof00.smt2 rename to test/regress/regress1/proof00.smt2 diff --git a/test/regress/regress1/push-pop/Makefile.am b/test/regress/regress1/push-pop/Makefile.am new file mode 100644 index 000000000..d1fe52984 --- /dev/null +++ b/test/regress/regress1/push-pop/Makefile.am @@ -0,0 +1,92 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + arith_lra_01.smt2 \ + arith_lra_02.smt2 \ + bug-fmf-fun-skolem.smt2 \ + bug216.smt2 \ + bug326.smt2 \ + fuzz_1_to_52_merged.smt2 \ + fuzz_1.smt2 \ + fuzz_10.smt2 \ + fuzz_11.smt2 \ + fuzz_15.smt2 \ + fuzz_16.smt2 \ + fuzz_19.smt2 \ + fuzz_20.smt2 \ + fuzz_23.smt2 \ + fuzz_24.smt2 \ + fuzz_25.smt2 \ + fuzz_26.smt2 \ + fuzz_28.smt2 \ + fuzz_29.smt2 \ + fuzz_3_1.smt2 \ + fuzz_3_10.smt2 \ + fuzz_3_11.smt2 \ + fuzz_3_12.smt2 \ + fuzz_3_13.smt2 \ + fuzz_3_14.smt2 \ + fuzz_3_15.smt2 \ + fuzz_3_2.smt2 \ + fuzz_3_3.smt2 \ + fuzz_3_4.smt2 \ + fuzz_3_5.smt2 \ + fuzz_3_6.smt2 \ + fuzz_3_7.smt2 \ + fuzz_3_8.smt2 \ + fuzz_3_9.smt2 \ + fuzz_30.smt2 \ + fuzz_32.smt2 \ + fuzz_34.smt2 \ + fuzz_35.smt2 \ + fuzz_37.smt2 \ + fuzz_39.smt2 \ + fuzz_4.smt2 \ + fuzz_40.smt2 \ + fuzz_41.smt2 \ + fuzz_42.smt2 \ + fuzz_43.smt2 \ + fuzz_44.smt2 \ + fuzz_45.smt2 \ + fuzz_5_1.smt2 \ + fuzz_5_2.smt2 \ + fuzz_5_3.smt2 \ + fuzz_5_4.smt2 \ + fuzz_5_5.smt2 \ + fuzz_5_6.smt2 \ + fuzz_5.smt2 \ + fuzz_51.smt2 \ + fuzz_52.smt2 \ + fuzz_6.smt2 \ + fuzz_7.smt2 \ + fuzz_8.smt2 \ + fuzz_9.smt2 \ + quant-fun-proc-unmacro.smt2 \ + quant-fun-proc.smt2 + +EXTRA_DIST = $(TESTS) \ + bug216.smt2.expect + +# synonyms for "check" in this directory +.PHONY: regress regress1 test +regress regress1 test: check + +# do nothing in this subdir +.PHONY: regress0 regress2 regress3 regress4 +regress0 regress2 regress3 regress4: diff --git a/test/regress/regress0/push-pop/arith_lra_01.smt2 b/test/regress/regress1/push-pop/arith_lra_01.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith_lra_01.smt2 rename to test/regress/regress1/push-pop/arith_lra_01.smt2 diff --git a/test/regress/regress0/push-pop/arith_lra_02.smt2 b/test/regress/regress1/push-pop/arith_lra_02.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith_lra_02.smt2 rename to test/regress/regress1/push-pop/arith_lra_02.smt2 diff --git a/test/regress/regress0/push-pop/bug-fmf-fun-skolem.smt2 b/test/regress/regress1/push-pop/bug-fmf-fun-skolem.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug-fmf-fun-skolem.smt2 rename to test/regress/regress1/push-pop/bug-fmf-fun-skolem.smt2 diff --git a/test/regress/regress0/push-pop/bug216.smt2 b/test/regress/regress1/push-pop/bug216.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug216.smt2 rename to test/regress/regress1/push-pop/bug216.smt2 diff --git a/test/regress/regress0/push-pop/bug216.smt2.expect b/test/regress/regress1/push-pop/bug216.smt2.expect similarity index 100% rename from test/regress/regress0/push-pop/bug216.smt2.expect rename to test/regress/regress1/push-pop/bug216.smt2.expect diff --git a/test/regress/regress0/push-pop/bug326.smt2 b/test/regress/regress1/push-pop/bug326.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug326.smt2 rename to test/regress/regress1/push-pop/bug326.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_1.smt2 b/test/regress/regress1/push-pop/fuzz_1.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_1.smt2 rename to test/regress/regress1/push-pop/fuzz_1.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_10.smt2 b/test/regress/regress1/push-pop/fuzz_10.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_10.smt2 rename to test/regress/regress1/push-pop/fuzz_10.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_11.smt2 b/test/regress/regress1/push-pop/fuzz_11.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_11.smt2 rename to test/regress/regress1/push-pop/fuzz_11.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_15.smt2 b/test/regress/regress1/push-pop/fuzz_15.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_15.smt2 rename to test/regress/regress1/push-pop/fuzz_15.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_16.smt2 b/test/regress/regress1/push-pop/fuzz_16.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_16.smt2 rename to test/regress/regress1/push-pop/fuzz_16.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_19.smt2 b/test/regress/regress1/push-pop/fuzz_19.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_19.smt2 rename to test/regress/regress1/push-pop/fuzz_19.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_1_to_52_merged.smt2 b/test/regress/regress1/push-pop/fuzz_1_to_52_merged.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_1_to_52_merged.smt2 rename to test/regress/regress1/push-pop/fuzz_1_to_52_merged.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_20.smt2 b/test/regress/regress1/push-pop/fuzz_20.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_20.smt2 rename to test/regress/regress1/push-pop/fuzz_20.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_23.smt2 b/test/regress/regress1/push-pop/fuzz_23.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_23.smt2 rename to test/regress/regress1/push-pop/fuzz_23.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_24.smt2 b/test/regress/regress1/push-pop/fuzz_24.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_24.smt2 rename to test/regress/regress1/push-pop/fuzz_24.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_25.smt2 b/test/regress/regress1/push-pop/fuzz_25.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_25.smt2 rename to test/regress/regress1/push-pop/fuzz_25.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_26.smt2 b/test/regress/regress1/push-pop/fuzz_26.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_26.smt2 rename to test/regress/regress1/push-pop/fuzz_26.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_28.smt2 b/test/regress/regress1/push-pop/fuzz_28.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_28.smt2 rename to test/regress/regress1/push-pop/fuzz_28.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_29.smt2 b/test/regress/regress1/push-pop/fuzz_29.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_29.smt2 rename to test/regress/regress1/push-pop/fuzz_29.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_30.smt2 b/test/regress/regress1/push-pop/fuzz_30.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_30.smt2 rename to test/regress/regress1/push-pop/fuzz_30.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_32.smt2 b/test/regress/regress1/push-pop/fuzz_32.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_32.smt2 rename to test/regress/regress1/push-pop/fuzz_32.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_34.smt2 b/test/regress/regress1/push-pop/fuzz_34.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_34.smt2 rename to test/regress/regress1/push-pop/fuzz_34.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_35.smt2 b/test/regress/regress1/push-pop/fuzz_35.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_35.smt2 rename to test/regress/regress1/push-pop/fuzz_35.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_37.smt2 b/test/regress/regress1/push-pop/fuzz_37.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_37.smt2 rename to test/regress/regress1/push-pop/fuzz_37.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_39.smt2 b/test/regress/regress1/push-pop/fuzz_39.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_39.smt2 rename to test/regress/regress1/push-pop/fuzz_39.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_1.smt2 b/test/regress/regress1/push-pop/fuzz_3_1.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_1.smt2 rename to test/regress/regress1/push-pop/fuzz_3_1.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_10.smt2 b/test/regress/regress1/push-pop/fuzz_3_10.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_10.smt2 rename to test/regress/regress1/push-pop/fuzz_3_10.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_11.smt2 b/test/regress/regress1/push-pop/fuzz_3_11.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_11.smt2 rename to test/regress/regress1/push-pop/fuzz_3_11.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_12.smt2 b/test/regress/regress1/push-pop/fuzz_3_12.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_12.smt2 rename to test/regress/regress1/push-pop/fuzz_3_12.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_13.smt2 b/test/regress/regress1/push-pop/fuzz_3_13.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_13.smt2 rename to test/regress/regress1/push-pop/fuzz_3_13.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_14.smt2 b/test/regress/regress1/push-pop/fuzz_3_14.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_14.smt2 rename to test/regress/regress1/push-pop/fuzz_3_14.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_15.smt2 b/test/regress/regress1/push-pop/fuzz_3_15.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_15.smt2 rename to test/regress/regress1/push-pop/fuzz_3_15.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_2.smt2 b/test/regress/regress1/push-pop/fuzz_3_2.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_2.smt2 rename to test/regress/regress1/push-pop/fuzz_3_2.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_3.smt2 b/test/regress/regress1/push-pop/fuzz_3_3.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_3.smt2 rename to test/regress/regress1/push-pop/fuzz_3_3.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_4.smt2 b/test/regress/regress1/push-pop/fuzz_3_4.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_4.smt2 rename to test/regress/regress1/push-pop/fuzz_3_4.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_5.smt2 b/test/regress/regress1/push-pop/fuzz_3_5.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_5.smt2 rename to test/regress/regress1/push-pop/fuzz_3_5.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_6.smt2 b/test/regress/regress1/push-pop/fuzz_3_6.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_6.smt2 rename to test/regress/regress1/push-pop/fuzz_3_6.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_7.smt2 b/test/regress/regress1/push-pop/fuzz_3_7.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_7.smt2 rename to test/regress/regress1/push-pop/fuzz_3_7.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_8.smt2 b/test/regress/regress1/push-pop/fuzz_3_8.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_8.smt2 rename to test/regress/regress1/push-pop/fuzz_3_8.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_3_9.smt2 b/test/regress/regress1/push-pop/fuzz_3_9.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_3_9.smt2 rename to test/regress/regress1/push-pop/fuzz_3_9.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_4.smt2 b/test/regress/regress1/push-pop/fuzz_4.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_4.smt2 rename to test/regress/regress1/push-pop/fuzz_4.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_40.smt2 b/test/regress/regress1/push-pop/fuzz_40.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_40.smt2 rename to test/regress/regress1/push-pop/fuzz_40.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_41.smt2 b/test/regress/regress1/push-pop/fuzz_41.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_41.smt2 rename to test/regress/regress1/push-pop/fuzz_41.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_42.smt2 b/test/regress/regress1/push-pop/fuzz_42.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_42.smt2 rename to test/regress/regress1/push-pop/fuzz_42.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_43.smt2 b/test/regress/regress1/push-pop/fuzz_43.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_43.smt2 rename to test/regress/regress1/push-pop/fuzz_43.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_44.smt2 b/test/regress/regress1/push-pop/fuzz_44.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_44.smt2 rename to test/regress/regress1/push-pop/fuzz_44.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_45.smt2 b/test/regress/regress1/push-pop/fuzz_45.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_45.smt2 rename to test/regress/regress1/push-pop/fuzz_45.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_5.smt2 b/test/regress/regress1/push-pop/fuzz_5.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_5.smt2 rename to test/regress/regress1/push-pop/fuzz_5.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_51.smt2 b/test/regress/regress1/push-pop/fuzz_51.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_51.smt2 rename to test/regress/regress1/push-pop/fuzz_51.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_52.smt2 b/test/regress/regress1/push-pop/fuzz_52.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_52.smt2 rename to test/regress/regress1/push-pop/fuzz_52.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_5_1.smt2 b/test/regress/regress1/push-pop/fuzz_5_1.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_5_1.smt2 rename to test/regress/regress1/push-pop/fuzz_5_1.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_5_2.smt2 b/test/regress/regress1/push-pop/fuzz_5_2.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_5_2.smt2 rename to test/regress/regress1/push-pop/fuzz_5_2.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_5_3.smt2 b/test/regress/regress1/push-pop/fuzz_5_3.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_5_3.smt2 rename to test/regress/regress1/push-pop/fuzz_5_3.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_5_4.smt2 b/test/regress/regress1/push-pop/fuzz_5_4.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_5_4.smt2 rename to test/regress/regress1/push-pop/fuzz_5_4.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_5_5.smt2 b/test/regress/regress1/push-pop/fuzz_5_5.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_5_5.smt2 rename to test/regress/regress1/push-pop/fuzz_5_5.smt2 diff --git a/test/regress/regress0/push-pop/arith/fuzz_5_6.smt2 b/test/regress/regress1/push-pop/fuzz_5_6.smt2 similarity index 100% rename from test/regress/regress0/push-pop/arith/fuzz_5_6.smt2 rename to test/regress/regress1/push-pop/fuzz_5_6.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_6.smt2 b/test/regress/regress1/push-pop/fuzz_6.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_6.smt2 rename to test/regress/regress1/push-pop/fuzz_6.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_7.smt2 b/test/regress/regress1/push-pop/fuzz_7.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_7.smt2 rename to test/regress/regress1/push-pop/fuzz_7.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_8.smt2 b/test/regress/regress1/push-pop/fuzz_8.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_8.smt2 rename to test/regress/regress1/push-pop/fuzz_8.smt2 diff --git a/test/regress/regress0/push-pop/boolean/fuzz_9.smt2 b/test/regress/regress1/push-pop/fuzz_9.smt2 similarity index 100% rename from test/regress/regress0/push-pop/boolean/fuzz_9.smt2 rename to test/regress/regress1/push-pop/fuzz_9.smt2 diff --git a/test/regress/regress0/push-pop/quant-fun-proc-unmacro.smt2 b/test/regress/regress1/push-pop/quant-fun-proc-unmacro.smt2 similarity index 100% rename from test/regress/regress0/push-pop/quant-fun-proc-unmacro.smt2 rename to test/regress/regress1/push-pop/quant-fun-proc-unmacro.smt2 diff --git a/test/regress/regress0/push-pop/quant-fun-proc.smt2 b/test/regress/regress1/push-pop/quant-fun-proc.smt2 similarity index 100% rename from test/regress/regress0/push-pop/quant-fun-proc.smt2 rename to test/regress/regress1/push-pop/quant-fun-proc.smt2 diff --git a/test/regress/regress0/quantifiers/006-cbqi-ite.smt2 b/test/regress/regress1/quantifiers/006-cbqi-ite.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/006-cbqi-ite.smt2 rename to test/regress/regress1/quantifiers/006-cbqi-ite.smt2 diff --git a/test/regress/regress0/quantifiers/AdditiveMethods_OwnedResults.Mz.smt2 b/test/regress/regress1/quantifiers/AdditiveMethods_OwnedResults.Mz.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/AdditiveMethods_OwnedResults.Mz.smt2 rename to test/regress/regress1/quantifiers/AdditiveMethods_OwnedResults.Mz.smt2 diff --git a/test/regress/regress0/quantifiers/Arrays_Q1-noinfer.smt2 b/test/regress/regress1/quantifiers/Arrays_Q1-noinfer.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/Arrays_Q1-noinfer.smt2 rename to test/regress/regress1/quantifiers/Arrays_Q1-noinfer.smt2 diff --git a/test/regress/regress1/quantifiers/Makefile.am b/test/regress/regress1/quantifiers/Makefile.am index cc5834a31..7d3da3654 100644 --- a/test/regress/regress1/quantifiers/Makefile.am +++ b/test/regress/regress1/quantifiers/Makefile.am @@ -17,9 +17,80 @@ endif # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" TESTS = \ - bug802.smt2 + bug802.smt2 \ + 006-cbqi-ite.smt2 \ + AdditiveMethods_OwnedResults.Mz.smt2 \ + ari118-bv-2occ-x.smt2 \ + array-unsat-simp3.smt2 \ + bignum_quant.smt2 \ + bug_743.smt2 \ + bug822.smt2 \ + cdt-0208-to.smt2 \ + gauss_init_0030.fof.smt2 \ + inst-max-level-segf.smt2 \ + intersection-example-onelane.proof-node22337.smt2 \ + javafe.ast.StmtVec.009.smt2 \ + model_6_1_bv.smt2 \ + nested9_true-unreach-call.i_575.smt2 \ + NUM878.smt2 \ + opisavailable-12.smt2 \ + psyco-107-bv.smt2 \ + psyco-196.smt2 \ + qbv-simple-2vars-vo.smt2 \ + qbv-test-invert-bvcomp.smt2 \ + qbv-test-invert-bvudiv-0.smt2 \ + qbv-test-invert-bvudiv-1.smt2 \ + qbv-test-invert-bvurem-1.smt2 \ + qcft-javafe.filespace.TreeWalker.006.smt2 \ + qcft-smtlib3dbc51.smt2 \ + quaternion_ds1_symm_0428.fof.smt2 \ + rew-to-0211-dd.smt2 \ + ricart-agrawala6.smt2 \ + RND_4_16.smt2 \ + small-pipeline-fixpoint-3.smt2 \ + smtlib384a03.smt2 \ + smtlib46f14a.smt2 \ + smtlibf957ea.smt2 \ + stream-x2014-09-18-unsat.smt2 \ + symmetric_unsat_7.smt2 \ + anti-sk-simp.smt2 \ + Arrays_Q1-noinfer.smt2 \ + bi-artm-s.smt2 \ + burns13.smt2 \ + burns4.smt2 \ + cbqi-sdlx-fixpoint-3-dd.smt2 \ + ext-ex-deq-trigger.smt2 \ + extract-nproc.smt2 \ + florian-case-ax.smt2 \ + is-even.smt2 \ + mix-coeff.smt2 \ + parametric-lists.smt2 \ + psyco-001-bv.smt2 \ + qbv-disequality3.smt2 \ + qbv-test-invert-bvashr-0.smt2 \ + qbv-test-invert-bvashr-1.smt2 \ + qbv-test-invert-bvlshr-1.smt2 \ + qbv-test-invert-bvmul-neq.smt2 \ + qbv-test-invert-bvmul.smt2 \ + qbv-test-invert-bvudiv-0-neq.smt2 \ + qbv-test-invert-bvudiv-1-neq.smt2 \ + qbv-test-invert-bvurem-1-neq.smt2 \ + qbv-test-urem-rewrite.smt2 \ + RND-small.smt2 \ + RNDPRE_4_1-dd-nqe.smt2 \ + set8.smt2 \ + z3.620661-no-fv-trigger.smt2 -EXTRA_DIST = $(TESTS) +# removed because they take more than 20s +# javafe.ast.ArrayInit.35.smt2 + +# FIXME: I've disabled these since they give different error messages on production and debug +# macro-subtype-param.smt2 +# subtype-param-unk.smt2 +# subtype-param.smt2 + +EXTRA_DIST = $(TESTS) \ + set3.smt2 # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress0/quantifiers/NUM878.smt2 b/test/regress/regress1/quantifiers/NUM878.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/NUM878.smt2 rename to test/regress/regress1/quantifiers/NUM878.smt2 diff --git a/test/regress/regress0/quantifiers/RND-small.smt2 b/test/regress/regress1/quantifiers/RND-small.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/RND-small.smt2 rename to test/regress/regress1/quantifiers/RND-small.smt2 diff --git a/test/regress/regress0/quantifiers/RNDPRE_4_1-dd-nqe.smt2 b/test/regress/regress1/quantifiers/RNDPRE_4_1-dd-nqe.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/RNDPRE_4_1-dd-nqe.smt2 rename to test/regress/regress1/quantifiers/RNDPRE_4_1-dd-nqe.smt2 diff --git a/test/regress/regress0/quantifiers/RND_4_16.smt2 b/test/regress/regress1/quantifiers/RND_4_16.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/RND_4_16.smt2 rename to test/regress/regress1/quantifiers/RND_4_16.smt2 diff --git a/test/regress/regress0/quantifiers/anti-sk-simp.smt2 b/test/regress/regress1/quantifiers/anti-sk-simp.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/anti-sk-simp.smt2 rename to test/regress/regress1/quantifiers/anti-sk-simp.smt2 diff --git a/test/regress/regress0/quantifiers/ari118-bv-2occ-x.smt2 b/test/regress/regress1/quantifiers/ari118-bv-2occ-x.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/ari118-bv-2occ-x.smt2 rename to test/regress/regress1/quantifiers/ari118-bv-2occ-x.smt2 diff --git a/test/regress/regress0/quantifiers/array-unsat-simp3.smt2 b/test/regress/regress1/quantifiers/array-unsat-simp3.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/array-unsat-simp3.smt2 rename to test/regress/regress1/quantifiers/array-unsat-simp3.smt2 diff --git a/test/regress/regress0/quantifiers/bi-artm-s.smt2 b/test/regress/regress1/quantifiers/bi-artm-s.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/bi-artm-s.smt2 rename to test/regress/regress1/quantifiers/bi-artm-s.smt2 diff --git a/test/regress/regress0/quantifiers/bignum_quant.smt2 b/test/regress/regress1/quantifiers/bignum_quant.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/bignum_quant.smt2 rename to test/regress/regress1/quantifiers/bignum_quant.smt2 diff --git a/test/regress/regress0/quantifiers/bug822.smt2 b/test/regress/regress1/quantifiers/bug822.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/bug822.smt2 rename to test/regress/regress1/quantifiers/bug822.smt2 diff --git a/test/regress/regress0/quantifiers/bug_743.smt2 b/test/regress/regress1/quantifiers/bug_743.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/bug_743.smt2 rename to test/regress/regress1/quantifiers/bug_743.smt2 diff --git a/test/regress/regress0/quantifiers/burns13.smt2 b/test/regress/regress1/quantifiers/burns13.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/burns13.smt2 rename to test/regress/regress1/quantifiers/burns13.smt2 diff --git a/test/regress/regress0/quantifiers/burns4.smt2 b/test/regress/regress1/quantifiers/burns4.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/burns4.smt2 rename to test/regress/regress1/quantifiers/burns4.smt2 diff --git a/test/regress/regress0/quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 b/test/regress/regress1/quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 rename to test/regress/regress1/quantifiers/cbqi-sdlx-fixpoint-3-dd.smt2 diff --git a/test/regress/regress0/quantifiers/cdt-0208-to.smt2 b/test/regress/regress1/quantifiers/cdt-0208-to.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/cdt-0208-to.smt2 rename to test/regress/regress1/quantifiers/cdt-0208-to.smt2 diff --git a/test/regress/regress0/quantifiers/ext-ex-deq-trigger.smt2 b/test/regress/regress1/quantifiers/ext-ex-deq-trigger.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/ext-ex-deq-trigger.smt2 rename to test/regress/regress1/quantifiers/ext-ex-deq-trigger.smt2 diff --git a/test/regress/regress0/quantifiers/extract-nproc.smt2 b/test/regress/regress1/quantifiers/extract-nproc.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/extract-nproc.smt2 rename to test/regress/regress1/quantifiers/extract-nproc.smt2 diff --git a/test/regress/regress0/quantifiers/florian-case-ax.smt2 b/test/regress/regress1/quantifiers/florian-case-ax.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/florian-case-ax.smt2 rename to test/regress/regress1/quantifiers/florian-case-ax.smt2 diff --git a/test/regress/regress0/quantifiers/gauss_init_0030.fof.smt2 b/test/regress/regress1/quantifiers/gauss_init_0030.fof.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/gauss_init_0030.fof.smt2 rename to test/regress/regress1/quantifiers/gauss_init_0030.fof.smt2 diff --git a/test/regress/regress0/quantifiers/inst-max-level-segf.smt2 b/test/regress/regress1/quantifiers/inst-max-level-segf.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/inst-max-level-segf.smt2 rename to test/regress/regress1/quantifiers/inst-max-level-segf.smt2 diff --git a/test/regress/regress0/quantifiers/intersection-example-onelane.proof-node22337.smt2 b/test/regress/regress1/quantifiers/intersection-example-onelane.proof-node22337.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/intersection-example-onelane.proof-node22337.smt2 rename to test/regress/regress1/quantifiers/intersection-example-onelane.proof-node22337.smt2 diff --git a/test/regress/regress0/quantifiers/is-even.smt2 b/test/regress/regress1/quantifiers/is-even.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/is-even.smt2 rename to test/regress/regress1/quantifiers/is-even.smt2 diff --git a/test/regress/regress0/quantifiers/javafe.ast.StmtVec.009.smt2 b/test/regress/regress1/quantifiers/javafe.ast.StmtVec.009.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/javafe.ast.StmtVec.009.smt2 rename to test/regress/regress1/quantifiers/javafe.ast.StmtVec.009.smt2 diff --git a/test/regress/regress0/quantifiers/macro-subtype-param.smt2 b/test/regress/regress1/quantifiers/macro-subtype-param.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/macro-subtype-param.smt2 rename to test/regress/regress1/quantifiers/macro-subtype-param.smt2 diff --git a/test/regress/regress0/quantifiers/mix-coeff.smt2 b/test/regress/regress1/quantifiers/mix-coeff.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/mix-coeff.smt2 rename to test/regress/regress1/quantifiers/mix-coeff.smt2 diff --git a/test/regress/regress0/quantifiers/model_6_1_bv.smt2 b/test/regress/regress1/quantifiers/model_6_1_bv.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/model_6_1_bv.smt2 rename to test/regress/regress1/quantifiers/model_6_1_bv.smt2 diff --git a/test/regress/regress0/quantifiers/nested9_true-unreach-call.i_575.smt2 b/test/regress/regress1/quantifiers/nested9_true-unreach-call.i_575.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/nested9_true-unreach-call.i_575.smt2 rename to test/regress/regress1/quantifiers/nested9_true-unreach-call.i_575.smt2 diff --git a/test/regress/regress0/quantifiers/opisavailable-12.smt2 b/test/regress/regress1/quantifiers/opisavailable-12.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/opisavailable-12.smt2 rename to test/regress/regress1/quantifiers/opisavailable-12.smt2 diff --git a/test/regress/regress0/quantifiers/parametric-lists.smt2 b/test/regress/regress1/quantifiers/parametric-lists.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/parametric-lists.smt2 rename to test/regress/regress1/quantifiers/parametric-lists.smt2 diff --git a/test/regress/regress0/quantifiers/psyco-001-bv.smt2 b/test/regress/regress1/quantifiers/psyco-001-bv.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/psyco-001-bv.smt2 rename to test/regress/regress1/quantifiers/psyco-001-bv.smt2 diff --git a/test/regress/regress0/quantifiers/psyco-107-bv.smt2 b/test/regress/regress1/quantifiers/psyco-107-bv.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/psyco-107-bv.smt2 rename to test/regress/regress1/quantifiers/psyco-107-bv.smt2 diff --git a/test/regress/regress0/quantifiers/psyco-196.smt2 b/test/regress/regress1/quantifiers/psyco-196.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/psyco-196.smt2 rename to test/regress/regress1/quantifiers/psyco-196.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-disequality3.smt2 b/test/regress/regress1/quantifiers/qbv-disequality3.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-disequality3.smt2 rename to test/regress/regress1/quantifiers/qbv-disequality3.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 b/test/regress/regress1/quantifiers/qbv-simple-2vars-vo.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-simple-2vars-vo.smt2 rename to test/regress/regress1/quantifiers/qbv-simple-2vars-vo.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvashr-0.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvashr-0.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvashr-0.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvashr-0.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvashr-1.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvashr-1.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvashr-1.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvashr-1.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvcomp.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvcomp.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvcomp.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvcomp.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvlshr-1.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvlshr-1.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvlshr-1.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvlshr-1.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvmul-neq.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvmul-neq.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvmul-neq.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvmul-neq.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvmul.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvmul.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvmul.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvmul.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-0-neq.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-0-neq.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-0-neq.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-0-neq.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-0.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-0.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-0.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-0.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-1-neq.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-1-neq.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-1-neq.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-1-neq.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-1.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-1.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvudiv-1.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvudiv-1.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvurem-1-neq.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvurem-1-neq.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvurem-1-neq.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvurem-1-neq.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-invert-bvurem-1.smt2 b/test/regress/regress1/quantifiers/qbv-test-invert-bvurem-1.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-invert-bvurem-1.smt2 rename to test/regress/regress1/quantifiers/qbv-test-invert-bvurem-1.smt2 diff --git a/test/regress/regress0/quantifiers/qbv-test-urem-rewrite.smt2 b/test/regress/regress1/quantifiers/qbv-test-urem-rewrite.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qbv-test-urem-rewrite.smt2 rename to test/regress/regress1/quantifiers/qbv-test-urem-rewrite.smt2 diff --git a/test/regress/regress0/quantifiers/qcft-javafe.filespace.TreeWalker.006.smt2 b/test/regress/regress1/quantifiers/qcft-javafe.filespace.TreeWalker.006.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qcft-javafe.filespace.TreeWalker.006.smt2 rename to test/regress/regress1/quantifiers/qcft-javafe.filespace.TreeWalker.006.smt2 diff --git a/test/regress/regress0/quantifiers/qcft-smtlib3dbc51.smt2 b/test/regress/regress1/quantifiers/qcft-smtlib3dbc51.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/qcft-smtlib3dbc51.smt2 rename to test/regress/regress1/quantifiers/qcft-smtlib3dbc51.smt2 diff --git a/test/regress/regress0/quantifiers/quaternion_ds1_symm_0428.fof.smt2 b/test/regress/regress1/quantifiers/quaternion_ds1_symm_0428.fof.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/quaternion_ds1_symm_0428.fof.smt2 rename to test/regress/regress1/quantifiers/quaternion_ds1_symm_0428.fof.smt2 diff --git a/test/regress/regress0/quantifiers/rew-to-0211-dd.smt2 b/test/regress/regress1/quantifiers/rew-to-0211-dd.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/rew-to-0211-dd.smt2 rename to test/regress/regress1/quantifiers/rew-to-0211-dd.smt2 diff --git a/test/regress/regress0/quantifiers/ricart-agrawala6.smt2 b/test/regress/regress1/quantifiers/ricart-agrawala6.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/ricart-agrawala6.smt2 rename to test/regress/regress1/quantifiers/ricart-agrawala6.smt2 diff --git a/test/regress/regress0/quantifiers/set3.smt2 b/test/regress/regress1/quantifiers/set3.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/set3.smt2 rename to test/regress/regress1/quantifiers/set3.smt2 diff --git a/test/regress/regress0/quantifiers/set8.smt2 b/test/regress/regress1/quantifiers/set8.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/set8.smt2 rename to test/regress/regress1/quantifiers/set8.smt2 diff --git a/test/regress/regress0/quantifiers/small-pipeline-fixpoint-3.smt2 b/test/regress/regress1/quantifiers/small-pipeline-fixpoint-3.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/small-pipeline-fixpoint-3.smt2 rename to test/regress/regress1/quantifiers/small-pipeline-fixpoint-3.smt2 diff --git a/test/regress/regress0/quantifiers/smtlib384a03.smt2 b/test/regress/regress1/quantifiers/smtlib384a03.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/smtlib384a03.smt2 rename to test/regress/regress1/quantifiers/smtlib384a03.smt2 diff --git a/test/regress/regress0/quantifiers/smtlib46f14a.smt2 b/test/regress/regress1/quantifiers/smtlib46f14a.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/smtlib46f14a.smt2 rename to test/regress/regress1/quantifiers/smtlib46f14a.smt2 diff --git a/test/regress/regress0/quantifiers/smtlibf957ea.smt2 b/test/regress/regress1/quantifiers/smtlibf957ea.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/smtlibf957ea.smt2 rename to test/regress/regress1/quantifiers/smtlibf957ea.smt2 diff --git a/test/regress/regress0/quantifiers/stream-x2014-09-18-unsat.smt2 b/test/regress/regress1/quantifiers/stream-x2014-09-18-unsat.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/stream-x2014-09-18-unsat.smt2 rename to test/regress/regress1/quantifiers/stream-x2014-09-18-unsat.smt2 diff --git a/test/regress/regress0/quantifiers/subtype-param-unk.smt2 b/test/regress/regress1/quantifiers/subtype-param-unk.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/subtype-param-unk.smt2 rename to test/regress/regress1/quantifiers/subtype-param-unk.smt2 diff --git a/test/regress/regress0/quantifiers/subtype-param.smt2 b/test/regress/regress1/quantifiers/subtype-param.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/subtype-param.smt2 rename to test/regress/regress1/quantifiers/subtype-param.smt2 diff --git a/test/regress/regress0/quantifiers/symmetric_unsat_7.smt2 b/test/regress/regress1/quantifiers/symmetric_unsat_7.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/symmetric_unsat_7.smt2 rename to test/regress/regress1/quantifiers/symmetric_unsat_7.smt2 diff --git a/test/regress/regress0/quantifiers/z3.620661-no-fv-trigger.smt2 b/test/regress/regress1/quantifiers/z3.620661-no-fv-trigger.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/z3.620661-no-fv-trigger.smt2 rename to test/regress/regress1/quantifiers/z3.620661-no-fv-trigger.smt2 diff --git a/test/regress/regress1/rels/Makefile.am b/test/regress/regress1/rels/Makefile.am new file mode 100644 index 000000000..c35ea2914 --- /dev/null +++ b/test/regress/regress1/rels/Makefile.am @@ -0,0 +1,66 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + bv1p.cvc \ + rel_pressure_0.cvc \ + rel_tc_5_1.cvc \ + set-strat.cvc \ + addr_book_1_1.cvc \ + addr_book_1.cvc \ + bv1-unit.cvc \ + bv1-unitb.cvc \ + bv1.cvc \ + bv1p-sat.cvc \ + bv2.cvc \ + iden_1_1.cvc \ + join-eq-structure_0_1.cvc \ + join-eq-structure-and.cvc \ + join-eq-structure.cvc \ + joinImg_0_1.cvc \ + joinImg_0_2.cvc \ + joinImg_1_1.cvc \ + joinImg_1.cvc \ + joinImg_2_1.cvc \ + joinImg_2.cvc \ + prod-mod-eq.cvc \ + prod-mod-eq2.cvc \ + rel_complex_3.cvc \ + rel_complex_4.cvc \ + rel_complex_5.cvc \ + rel_mix_0_1.cvc \ + rel_tc_10_1.cvc \ + rel_tc_4_1.cvc \ + rel_tc_4.cvc \ + rel_tc_6.cvc \ + rel_tc_9_1.cvc \ + rel_tp_2.cvc \ + rel_tp_join_2_1.cvc \ + strat_0_1.cvc \ + strat.cvc + +EXTRA_DIST = $(TESTS) \ + garbage_collect.cvc + +# synonyms for "check" in this directory +.PHONY: regress regress1 test +regress regress1 test: check + +# do nothing in this subdir +.PHONY: regress0 regress2 regress3 regress4 +regress0 regress2 regress3 regress4: diff --git a/test/regress/regress0/rels/addr_book_1.cvc b/test/regress/regress1/rels/addr_book_1.cvc similarity index 100% rename from test/regress/regress0/rels/addr_book_1.cvc rename to test/regress/regress1/rels/addr_book_1.cvc diff --git a/test/regress/regress0/rels/addr_book_1_1.cvc b/test/regress/regress1/rels/addr_book_1_1.cvc similarity index 100% rename from test/regress/regress0/rels/addr_book_1_1.cvc rename to test/regress/regress1/rels/addr_book_1_1.cvc diff --git a/test/regress/regress0/rels/bv1-unit.cvc b/test/regress/regress1/rels/bv1-unit.cvc similarity index 100% rename from test/regress/regress0/rels/bv1-unit.cvc rename to test/regress/regress1/rels/bv1-unit.cvc diff --git a/test/regress/regress0/rels/bv1-unitb.cvc b/test/regress/regress1/rels/bv1-unitb.cvc similarity index 100% rename from test/regress/regress0/rels/bv1-unitb.cvc rename to test/regress/regress1/rels/bv1-unitb.cvc diff --git a/test/regress/regress0/rels/bv1.cvc b/test/regress/regress1/rels/bv1.cvc similarity index 100% rename from test/regress/regress0/rels/bv1.cvc rename to test/regress/regress1/rels/bv1.cvc diff --git a/test/regress/regress0/rels/bv1p-sat.cvc b/test/regress/regress1/rels/bv1p-sat.cvc similarity index 100% rename from test/regress/regress0/rels/bv1p-sat.cvc rename to test/regress/regress1/rels/bv1p-sat.cvc diff --git a/test/regress/regress0/rels/bv1p.cvc b/test/regress/regress1/rels/bv1p.cvc similarity index 100% rename from test/regress/regress0/rels/bv1p.cvc rename to test/regress/regress1/rels/bv1p.cvc diff --git a/test/regress/regress0/rels/bv2.cvc b/test/regress/regress1/rels/bv2.cvc similarity index 100% rename from test/regress/regress0/rels/bv2.cvc rename to test/regress/regress1/rels/bv2.cvc diff --git a/test/regress/regress0/rels/garbage_collect.cvc b/test/regress/regress1/rels/garbage_collect.cvc similarity index 100% rename from test/regress/regress0/rels/garbage_collect.cvc rename to test/regress/regress1/rels/garbage_collect.cvc diff --git a/test/regress/regress0/rels/iden_1_1.cvc b/test/regress/regress1/rels/iden_1_1.cvc similarity index 100% rename from test/regress/regress0/rels/iden_1_1.cvc rename to test/regress/regress1/rels/iden_1_1.cvc diff --git a/test/regress/regress0/rels/join-eq-structure-and.cvc b/test/regress/regress1/rels/join-eq-structure-and.cvc similarity index 100% rename from test/regress/regress0/rels/join-eq-structure-and.cvc rename to test/regress/regress1/rels/join-eq-structure-and.cvc diff --git a/test/regress/regress0/rels/join-eq-structure.cvc b/test/regress/regress1/rels/join-eq-structure.cvc similarity index 100% rename from test/regress/regress0/rels/join-eq-structure.cvc rename to test/regress/regress1/rels/join-eq-structure.cvc diff --git a/test/regress/regress0/rels/join-eq-structure_0_1.cvc b/test/regress/regress1/rels/join-eq-structure_0_1.cvc similarity index 100% rename from test/regress/regress0/rels/join-eq-structure_0_1.cvc rename to test/regress/regress1/rels/join-eq-structure_0_1.cvc diff --git a/test/regress/regress0/rels/joinImg_0_1.cvc b/test/regress/regress1/rels/joinImg_0_1.cvc similarity index 100% rename from test/regress/regress0/rels/joinImg_0_1.cvc rename to test/regress/regress1/rels/joinImg_0_1.cvc diff --git a/test/regress/regress0/rels/joinImg_0_2.cvc b/test/regress/regress1/rels/joinImg_0_2.cvc similarity index 100% rename from test/regress/regress0/rels/joinImg_0_2.cvc rename to test/regress/regress1/rels/joinImg_0_2.cvc diff --git a/test/regress/regress0/rels/joinImg_1.cvc b/test/regress/regress1/rels/joinImg_1.cvc similarity index 100% rename from test/regress/regress0/rels/joinImg_1.cvc rename to test/regress/regress1/rels/joinImg_1.cvc diff --git a/test/regress/regress0/rels/joinImg_1_1.cvc b/test/regress/regress1/rels/joinImg_1_1.cvc similarity index 100% rename from test/regress/regress0/rels/joinImg_1_1.cvc rename to test/regress/regress1/rels/joinImg_1_1.cvc diff --git a/test/regress/regress0/rels/joinImg_2.cvc b/test/regress/regress1/rels/joinImg_2.cvc similarity index 100% rename from test/regress/regress0/rels/joinImg_2.cvc rename to test/regress/regress1/rels/joinImg_2.cvc diff --git a/test/regress/regress0/rels/joinImg_2_1.cvc b/test/regress/regress1/rels/joinImg_2_1.cvc similarity index 100% rename from test/regress/regress0/rels/joinImg_2_1.cvc rename to test/regress/regress1/rels/joinImg_2_1.cvc diff --git a/test/regress/regress0/rels/prod-mod-eq.cvc b/test/regress/regress1/rels/prod-mod-eq.cvc similarity index 100% rename from test/regress/regress0/rels/prod-mod-eq.cvc rename to test/regress/regress1/rels/prod-mod-eq.cvc diff --git a/test/regress/regress0/rels/prod-mod-eq2.cvc b/test/regress/regress1/rels/prod-mod-eq2.cvc similarity index 100% rename from test/regress/regress0/rels/prod-mod-eq2.cvc rename to test/regress/regress1/rels/prod-mod-eq2.cvc diff --git a/test/regress/regress0/rels/rel_complex_3.cvc b/test/regress/regress1/rels/rel_complex_3.cvc similarity index 100% rename from test/regress/regress0/rels/rel_complex_3.cvc rename to test/regress/regress1/rels/rel_complex_3.cvc diff --git a/test/regress/regress0/rels/rel_complex_4.cvc b/test/regress/regress1/rels/rel_complex_4.cvc similarity index 100% rename from test/regress/regress0/rels/rel_complex_4.cvc rename to test/regress/regress1/rels/rel_complex_4.cvc diff --git a/test/regress/regress0/rels/rel_complex_5.cvc b/test/regress/regress1/rels/rel_complex_5.cvc similarity index 100% rename from test/regress/regress0/rels/rel_complex_5.cvc rename to test/regress/regress1/rels/rel_complex_5.cvc diff --git a/test/regress/regress0/rels/rel_mix_0_1.cvc b/test/regress/regress1/rels/rel_mix_0_1.cvc similarity index 100% rename from test/regress/regress0/rels/rel_mix_0_1.cvc rename to test/regress/regress1/rels/rel_mix_0_1.cvc diff --git a/test/regress/regress0/rels/rel_pressure_0.cvc b/test/regress/regress1/rels/rel_pressure_0.cvc similarity index 100% rename from test/regress/regress0/rels/rel_pressure_0.cvc rename to test/regress/regress1/rels/rel_pressure_0.cvc diff --git a/test/regress/regress0/rels/rel_tc_10_1.cvc b/test/regress/regress1/rels/rel_tc_10_1.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tc_10_1.cvc rename to test/regress/regress1/rels/rel_tc_10_1.cvc diff --git a/test/regress/regress0/rels/rel_tc_4.cvc b/test/regress/regress1/rels/rel_tc_4.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tc_4.cvc rename to test/regress/regress1/rels/rel_tc_4.cvc diff --git a/test/regress/regress0/rels/rel_tc_4_1.cvc b/test/regress/regress1/rels/rel_tc_4_1.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tc_4_1.cvc rename to test/regress/regress1/rels/rel_tc_4_1.cvc diff --git a/test/regress/regress0/rels/rel_tc_5_1.cvc b/test/regress/regress1/rels/rel_tc_5_1.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tc_5_1.cvc rename to test/regress/regress1/rels/rel_tc_5_1.cvc diff --git a/test/regress/regress0/rels/rel_tc_6.cvc b/test/regress/regress1/rels/rel_tc_6.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tc_6.cvc rename to test/regress/regress1/rels/rel_tc_6.cvc diff --git a/test/regress/regress0/rels/rel_tc_9_1.cvc b/test/regress/regress1/rels/rel_tc_9_1.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tc_9_1.cvc rename to test/regress/regress1/rels/rel_tc_9_1.cvc diff --git a/test/regress/regress0/rels/rel_tp_2.cvc b/test/regress/regress1/rels/rel_tp_2.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tp_2.cvc rename to test/regress/regress1/rels/rel_tp_2.cvc diff --git a/test/regress/regress0/rels/rel_tp_join_2_1.cvc b/test/regress/regress1/rels/rel_tp_join_2_1.cvc similarity index 100% rename from test/regress/regress0/rels/rel_tp_join_2_1.cvc rename to test/regress/regress1/rels/rel_tp_join_2_1.cvc diff --git a/test/regress/regress0/rels/set-strat.cvc b/test/regress/regress1/rels/set-strat.cvc similarity index 100% rename from test/regress/regress0/rels/set-strat.cvc rename to test/regress/regress1/rels/set-strat.cvc diff --git a/test/regress/regress0/rels/strat.cvc b/test/regress/regress1/rels/strat.cvc similarity index 100% rename from test/regress/regress0/rels/strat.cvc rename to test/regress/regress1/rels/strat.cvc diff --git a/test/regress/regress0/rels/strat_0_1.cvc b/test/regress/regress1/rels/strat_0_1.cvc similarity index 100% rename from test/regress/regress0/rels/strat_0_1.cvc rename to test/regress/regress1/rels/strat_0_1.cvc diff --git a/test/regress/regress1/rewriterules/Makefile.am b/test/regress/regress1/rewriterules/Makefile.am index a5a045d2e..fbf3db47a 100644 --- a/test/regress/regress1/rewriterules/Makefile.am +++ b/test/regress/regress1/rewriterules/Makefile.am @@ -23,9 +23,31 @@ MAKEFLAGS = -k # put it below in "TESTS +=" TESTS = \ reachability_back_to_the_future.smt2 \ - read5.smt2 - -EXTRA_DIST = $(TESTS) + read5.smt2 \ + length_gen.smt2 \ + length_gen_020.smt2 \ + length_gen_020_sat.smt2 \ + length_gen_040.smt2 \ + length_gen_040_lemma.smt2 \ + length_gen_040_lemma_trigger.smt2 \ + datatypes_sat.smt2 + + +EXTRA_DIST = $(TESTS) \ + datatypes_clark_quantification.smt2 \ + datatypes2.smt2 \ + datatypes3.smt2 \ + length_gen_010_lemma.smt2 \ + length_gen_010.smt2 \ + length_gen_080.smt2 \ + length_gen_160_lemma.smt2 \ + length_gen_inv_160.smt2 \ + length_trick3_int.smt2 \ + length_trick3.smt2 \ + set_A_new_fast_tableau-base_sat.smt2 \ + set_A_new_fast_tableau-base.smt2 \ + test_guards.smt2 \ + why3_vstte10_max_sum_harness2.smt2 # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress0/rewriterules/datatypes2.smt2 b/test/regress/regress1/rewriterules/datatypes2.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/datatypes2.smt2 rename to test/regress/regress1/rewriterules/datatypes2.smt2 diff --git a/test/regress/regress0/rewriterules/datatypes3.smt2 b/test/regress/regress1/rewriterules/datatypes3.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/datatypes3.smt2 rename to test/regress/regress1/rewriterules/datatypes3.smt2 diff --git a/test/regress/regress0/rewriterules/datatypes_clark_quantification.smt2 b/test/regress/regress1/rewriterules/datatypes_clark_quantification.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/datatypes_clark_quantification.smt2 rename to test/regress/regress1/rewriterules/datatypes_clark_quantification.smt2 diff --git a/test/regress/regress0/rewriterules/datatypes_sat.smt2 b/test/regress/regress1/rewriterules/datatypes_sat.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/datatypes_sat.smt2 rename to test/regress/regress1/rewriterules/datatypes_sat.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen.smt2 b/test/regress/regress1/rewriterules/length_gen.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen.smt2 rename to test/regress/regress1/rewriterules/length_gen.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_010.smt2 b/test/regress/regress1/rewriterules/length_gen_010.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_010.smt2 rename to test/regress/regress1/rewriterules/length_gen_010.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_010_lemma.smt2 b/test/regress/regress1/rewriterules/length_gen_010_lemma.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_010_lemma.smt2 rename to test/regress/regress1/rewriterules/length_gen_010_lemma.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_020.smt2 b/test/regress/regress1/rewriterules/length_gen_020.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_020.smt2 rename to test/regress/regress1/rewriterules/length_gen_020.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_020_sat.smt2 b/test/regress/regress1/rewriterules/length_gen_020_sat.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_020_sat.smt2 rename to test/regress/regress1/rewriterules/length_gen_020_sat.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_040.smt2 b/test/regress/regress1/rewriterules/length_gen_040.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_040.smt2 rename to test/regress/regress1/rewriterules/length_gen_040.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_040_lemma.smt2 b/test/regress/regress1/rewriterules/length_gen_040_lemma.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_040_lemma.smt2 rename to test/regress/regress1/rewriterules/length_gen_040_lemma.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_040_lemma_trigger.smt2 b/test/regress/regress1/rewriterules/length_gen_040_lemma_trigger.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_040_lemma_trigger.smt2 rename to test/regress/regress1/rewriterules/length_gen_040_lemma_trigger.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_080.smt2 b/test/regress/regress1/rewriterules/length_gen_080.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_080.smt2 rename to test/regress/regress1/rewriterules/length_gen_080.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_160_lemma.smt2 b/test/regress/regress1/rewriterules/length_gen_160_lemma.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_160_lemma.smt2 rename to test/regress/regress1/rewriterules/length_gen_160_lemma.smt2 diff --git a/test/regress/regress0/rewriterules/length_gen_inv_160.smt2 b/test/regress/regress1/rewriterules/length_gen_inv_160.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_gen_inv_160.smt2 rename to test/regress/regress1/rewriterules/length_gen_inv_160.smt2 diff --git a/test/regress/regress0/rewriterules/length_trick3.smt2 b/test/regress/regress1/rewriterules/length_trick3.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_trick3.smt2 rename to test/regress/regress1/rewriterules/length_trick3.smt2 diff --git a/test/regress/regress0/rewriterules/length_trick3_int.smt2 b/test/regress/regress1/rewriterules/length_trick3_int.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/length_trick3_int.smt2 rename to test/regress/regress1/rewriterules/length_trick3_int.smt2 diff --git a/test/regress/regress0/rewriterules/set_A_new_fast_tableau-base.smt2 b/test/regress/regress1/rewriterules/set_A_new_fast_tableau-base.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/set_A_new_fast_tableau-base.smt2 rename to test/regress/regress1/rewriterules/set_A_new_fast_tableau-base.smt2 diff --git a/test/regress/regress0/rewriterules/set_A_new_fast_tableau-base_sat.smt2 b/test/regress/regress1/rewriterules/set_A_new_fast_tableau-base_sat.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/set_A_new_fast_tableau-base_sat.smt2 rename to test/regress/regress1/rewriterules/set_A_new_fast_tableau-base_sat.smt2 diff --git a/test/regress/regress0/rewriterules/test_guards.smt2 b/test/regress/regress1/rewriterules/test_guards.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/test_guards.smt2 rename to test/regress/regress1/rewriterules/test_guards.smt2 diff --git a/test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness2.smt2 b/test/regress/regress1/rewriterules/why3_vstte10_max_sum_harness2.smt2 similarity index 100% rename from test/regress/regress0/rewriterules/why3_vstte10_max_sum_harness2.smt2 rename to test/regress/regress1/rewriterules/why3_vstte10_max_sum_harness2.smt2 diff --git a/test/regress/regress1/sep/Makefile.am b/test/regress/regress1/sep/Makefile.am index 3bf63ff1a..bda7e4484 100644 --- a/test/regress/regress1/sep/Makefile.am +++ b/test/regress/regress1/sep/Makefile.am @@ -20,7 +20,34 @@ TESTS = \ loop-1220.smt2 \ sep-simp-unc.smt2 \ split-find-unsat.smt2 \ - split-find-unsat-w-emp.smt2 + split-find-unsat-w-emp.smt2 \ + dispose-list-4-init.smt2 \ + finite-witness-sat.smt2 \ + sep-find2.smt2 \ + sep-fmf-priority.smt2 \ + sep-neg-1refine.smt2 \ + sep-nterm-again.smt2 \ + chain-int.smt2 \ + crash1220.smt2 \ + emp2-quant-unsat.smt2 \ + fmf-nemp-2.smt2 \ + pto-04.smt2 \ + quant_wand.smt2 \ + sep-02.smt2 \ + sep-03.smt2 \ + sep-neg-nstrict.smt2 \ + sep-neg-nstrict2.smt2 \ + sep-neg-simple.smt2 \ + sep-neg-swap.smt2 \ + sep-nterm-val-model.smt2 \ + simple-neg-sat.smt2 \ + wand-0526-sat.smt2 \ + wand-false.smt2 \ + wand-nterm-simp.smt2 \ + wand-nterm-simp2.smt2 \ + wand-simp-sat.smt2 \ + wand-simp-sat2.smt2 \ + wand-simp-unsat.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/sep/chain-int.smt2 b/test/regress/regress1/sep/chain-int.smt2 similarity index 100% rename from test/regress/regress0/sep/chain-int.smt2 rename to test/regress/regress1/sep/chain-int.smt2 diff --git a/test/regress/regress0/sep/crash1220.smt2 b/test/regress/regress1/sep/crash1220.smt2 similarity index 100% rename from test/regress/regress0/sep/crash1220.smt2 rename to test/regress/regress1/sep/crash1220.smt2 diff --git a/test/regress/regress0/sep/dispose-list-4-init.smt2 b/test/regress/regress1/sep/dispose-list-4-init.smt2 similarity index 100% rename from test/regress/regress0/sep/dispose-list-4-init.smt2 rename to test/regress/regress1/sep/dispose-list-4-init.smt2 diff --git a/test/regress/regress0/sep/emp2-quant-unsat.smt2 b/test/regress/regress1/sep/emp2-quant-unsat.smt2 similarity index 100% rename from test/regress/regress0/sep/emp2-quant-unsat.smt2 rename to test/regress/regress1/sep/emp2-quant-unsat.smt2 diff --git a/test/regress/regress0/sep/finite-witness-sat.smt2 b/test/regress/regress1/sep/finite-witness-sat.smt2 similarity index 100% rename from test/regress/regress0/sep/finite-witness-sat.smt2 rename to test/regress/regress1/sep/finite-witness-sat.smt2 diff --git a/test/regress/regress0/sep/fmf-nemp-2.smt2 b/test/regress/regress1/sep/fmf-nemp-2.smt2 similarity index 100% rename from test/regress/regress0/sep/fmf-nemp-2.smt2 rename to test/regress/regress1/sep/fmf-nemp-2.smt2 diff --git a/test/regress/regress0/sep/pto-04.smt2 b/test/regress/regress1/sep/pto-04.smt2 similarity index 100% rename from test/regress/regress0/sep/pto-04.smt2 rename to test/regress/regress1/sep/pto-04.smt2 diff --git a/test/regress/regress0/sep/quant_wand.smt2 b/test/regress/regress1/sep/quant_wand.smt2 similarity index 100% rename from test/regress/regress0/sep/quant_wand.smt2 rename to test/regress/regress1/sep/quant_wand.smt2 diff --git a/test/regress/regress0/sep/sep-02.smt2 b/test/regress/regress1/sep/sep-02.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-02.smt2 rename to test/regress/regress1/sep/sep-02.smt2 diff --git a/test/regress/regress0/sep/sep-03.smt2 b/test/regress/regress1/sep/sep-03.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-03.smt2 rename to test/regress/regress1/sep/sep-03.smt2 diff --git a/test/regress/regress0/sep/sep-find2.smt2 b/test/regress/regress1/sep/sep-find2.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-find2.smt2 rename to test/regress/regress1/sep/sep-find2.smt2 diff --git a/test/regress/regress0/sep/sep-fmf-priority.smt2 b/test/regress/regress1/sep/sep-fmf-priority.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-fmf-priority.smt2 rename to test/regress/regress1/sep/sep-fmf-priority.smt2 diff --git a/test/regress/regress0/sep/sep-neg-1refine.smt2 b/test/regress/regress1/sep/sep-neg-1refine.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-neg-1refine.smt2 rename to test/regress/regress1/sep/sep-neg-1refine.smt2 diff --git a/test/regress/regress0/sep/sep-neg-nstrict.smt2 b/test/regress/regress1/sep/sep-neg-nstrict.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-neg-nstrict.smt2 rename to test/regress/regress1/sep/sep-neg-nstrict.smt2 diff --git a/test/regress/regress0/sep/sep-neg-nstrict2.smt2 b/test/regress/regress1/sep/sep-neg-nstrict2.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-neg-nstrict2.smt2 rename to test/regress/regress1/sep/sep-neg-nstrict2.smt2 diff --git a/test/regress/regress0/sep/sep-neg-simple.smt2 b/test/regress/regress1/sep/sep-neg-simple.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-neg-simple.smt2 rename to test/regress/regress1/sep/sep-neg-simple.smt2 diff --git a/test/regress/regress0/sep/sep-neg-swap.smt2 b/test/regress/regress1/sep/sep-neg-swap.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-neg-swap.smt2 rename to test/regress/regress1/sep/sep-neg-swap.smt2 diff --git a/test/regress/regress0/sep/sep-nterm-again.smt2 b/test/regress/regress1/sep/sep-nterm-again.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-nterm-again.smt2 rename to test/regress/regress1/sep/sep-nterm-again.smt2 diff --git a/test/regress/regress0/sep/sep-nterm-val-model.smt2 b/test/regress/regress1/sep/sep-nterm-val-model.smt2 similarity index 100% rename from test/regress/regress0/sep/sep-nterm-val-model.smt2 rename to test/regress/regress1/sep/sep-nterm-val-model.smt2 diff --git a/test/regress/regress0/sep/simple-neg-sat.smt2 b/test/regress/regress1/sep/simple-neg-sat.smt2 similarity index 100% rename from test/regress/regress0/sep/simple-neg-sat.smt2 rename to test/regress/regress1/sep/simple-neg-sat.smt2 diff --git a/test/regress/regress0/sep/wand-0526-sat.smt2 b/test/regress/regress1/sep/wand-0526-sat.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-0526-sat.smt2 rename to test/regress/regress1/sep/wand-0526-sat.smt2 diff --git a/test/regress/regress0/sep/wand-false.smt2 b/test/regress/regress1/sep/wand-false.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-false.smt2 rename to test/regress/regress1/sep/wand-false.smt2 diff --git a/test/regress/regress0/sep/wand-nterm-simp.smt2 b/test/regress/regress1/sep/wand-nterm-simp.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-nterm-simp.smt2 rename to test/regress/regress1/sep/wand-nterm-simp.smt2 diff --git a/test/regress/regress0/sep/wand-nterm-simp2.smt2 b/test/regress/regress1/sep/wand-nterm-simp2.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-nterm-simp2.smt2 rename to test/regress/regress1/sep/wand-nterm-simp2.smt2 diff --git a/test/regress/regress0/sep/wand-simp-sat.smt2 b/test/regress/regress1/sep/wand-simp-sat.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-simp-sat.smt2 rename to test/regress/regress1/sep/wand-simp-sat.smt2 diff --git a/test/regress/regress0/sep/wand-simp-sat2.smt2 b/test/regress/regress1/sep/wand-simp-sat2.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-simp-sat2.smt2 rename to test/regress/regress1/sep/wand-simp-sat2.smt2 diff --git a/test/regress/regress0/sep/wand-simp-unsat.smt2 b/test/regress/regress1/sep/wand-simp-unsat.smt2 similarity index 100% rename from test/regress/regress0/sep/wand-simp-unsat.smt2 rename to test/regress/regress1/sep/wand-simp-unsat.smt2 diff --git a/test/regress/regress0/sets/jan27/ListElem.hs.fqout.cvc4.38.smt2 b/test/regress/regress1/sets/ListElem.hs.fqout.cvc4.38.smt2 similarity index 100% rename from test/regress/regress0/sets/jan27/ListElem.hs.fqout.cvc4.38.smt2 rename to test/regress/regress1/sets/ListElem.hs.fqout.cvc4.38.smt2 diff --git a/test/regress/regress0/sets/feb3/ListElts.hs.fqout.cvc4.317.smt2 b/test/regress/regress1/sets/ListElts.hs.fqout.cvc4.317.smt2 similarity index 100% rename from test/regress/regress0/sets/feb3/ListElts.hs.fqout.cvc4.317.smt2 rename to test/regress/regress1/sets/ListElts.hs.fqout.cvc4.317.smt2 diff --git a/test/regress/regress1/sets/Makefile.am b/test/regress/regress1/sets/Makefile.am index b09a25303..f52ab44e7 100644 --- a/test/regress/regress1/sets/Makefile.am +++ b/test/regress/regress1/sets/Makefile.am @@ -18,9 +18,34 @@ endif # put it below in "TESTS +=" TESTS = \ sets-disequal.smt2 \ - card-vc6-minimized.smt2 - -EXTRA_DIST = $(TESTS) + card-vc6-minimized.smt2 \ + card-4.smt2 \ + fuzz15201.smt2 \ + insert_invariant_37_2.smt2 \ + remove_check_free_31_6.smt2 \ + TalkingAboutSets.hs.fqout.cvc4.3577.smt2 \ + arjun-set-univ.cvc \ + card-3.smt2 \ + card-5.smt2 \ + card-6.smt2 \ + card-7.smt2 \ + copy_check_heap_access_33_4.smt2 \ + deepmeas0.hs.fqout.cvc4.41.smt2 \ + fuzz14418.smt2 \ + fuzz31811.smt2 \ + lemmabug-ListElts317minimized.smt2 \ + ListElem.hs.fqout.cvc4.38.smt2 \ + ListElts.hs.fqout.cvc4.317.smt2 \ + sets-tuple-poly.cvc \ + sharingbug.smt2 \ + UniqueZipper.hs.1030minimized.cvc4.smt2 \ + UniqueZipper.hs.1030minimized2.cvc4.smt2 \ + UniqueZipper.hs.fqout.cvc4.10.smt2 \ + UniqueZipper.hs.fqout.cvc4.1832.smt2 \ + univ-set-uf-elim.smt2 + +EXTRA_DIST = $(TESTS) \ + setofsets-disequal.smt2 # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress0/sets/jan28/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 b/test/regress/regress1/sets/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 similarity index 100% rename from test/regress/regress0/sets/jan28/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 rename to test/regress/regress1/sets/TalkingAboutSets.hs.fqout.cvc4.3577.smt2 diff --git a/test/regress/regress0/sets/mar2014/UniqueZipper.hs.1030minimized.cvc4.smt2 b/test/regress/regress1/sets/UniqueZipper.hs.1030minimized.cvc4.smt2 similarity index 100% rename from test/regress/regress0/sets/mar2014/UniqueZipper.hs.1030minimized.cvc4.smt2 rename to test/regress/regress1/sets/UniqueZipper.hs.1030minimized.cvc4.smt2 diff --git a/test/regress/regress0/sets/mar2014/UniqueZipper.hs.1030minimized2.cvc4.smt2 b/test/regress/regress1/sets/UniqueZipper.hs.1030minimized2.cvc4.smt2 similarity index 100% rename from test/regress/regress0/sets/mar2014/UniqueZipper.hs.1030minimized2.cvc4.smt2 rename to test/regress/regress1/sets/UniqueZipper.hs.1030minimized2.cvc4.smt2 diff --git a/test/regress/regress0/sets/jan30/UniqueZipper.hs.fqout.cvc4.10.smt2 b/test/regress/regress1/sets/UniqueZipper.hs.fqout.cvc4.10.smt2 similarity index 100% rename from test/regress/regress0/sets/jan30/UniqueZipper.hs.fqout.cvc4.10.smt2 rename to test/regress/regress1/sets/UniqueZipper.hs.fqout.cvc4.10.smt2 diff --git a/test/regress/regress0/sets/jan30/UniqueZipper.hs.fqout.cvc4.1832.smt2 b/test/regress/regress1/sets/UniqueZipper.hs.fqout.cvc4.1832.smt2 similarity index 100% rename from test/regress/regress0/sets/jan30/UniqueZipper.hs.fqout.cvc4.1832.smt2 rename to test/regress/regress1/sets/UniqueZipper.hs.fqout.cvc4.1832.smt2 diff --git a/test/regress/regress0/sets/arjun-set-univ.cvc b/test/regress/regress1/sets/arjun-set-univ.cvc similarity index 100% rename from test/regress/regress0/sets/arjun-set-univ.cvc rename to test/regress/regress1/sets/arjun-set-univ.cvc diff --git a/test/regress/regress0/sets/card-3.smt2 b/test/regress/regress1/sets/card-3.smt2 similarity index 100% rename from test/regress/regress0/sets/card-3.smt2 rename to test/regress/regress1/sets/card-3.smt2 diff --git a/test/regress/regress0/sets/card-4.smt2 b/test/regress/regress1/sets/card-4.smt2 similarity index 100% rename from test/regress/regress0/sets/card-4.smt2 rename to test/regress/regress1/sets/card-4.smt2 diff --git a/test/regress/regress0/sets/card-5.smt2 b/test/regress/regress1/sets/card-5.smt2 similarity index 100% rename from test/regress/regress0/sets/card-5.smt2 rename to test/regress/regress1/sets/card-5.smt2 diff --git a/test/regress/regress0/sets/card-6.smt2 b/test/regress/regress1/sets/card-6.smt2 similarity index 100% rename from test/regress/regress0/sets/card-6.smt2 rename to test/regress/regress1/sets/card-6.smt2 diff --git a/test/regress/regress0/sets/card-7.smt2 b/test/regress/regress1/sets/card-7.smt2 similarity index 100% rename from test/regress/regress0/sets/card-7.smt2 rename to test/regress/regress1/sets/card-7.smt2 diff --git a/test/regress/regress0/sets/copy_check_heap_access_33_4.smt2 b/test/regress/regress1/sets/copy_check_heap_access_33_4.smt2 similarity index 100% rename from test/regress/regress0/sets/copy_check_heap_access_33_4.smt2 rename to test/regress/regress1/sets/copy_check_heap_access_33_4.smt2 diff --git a/test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 b/test/regress/regress1/sets/deepmeas0.hs.fqout.cvc4.41.smt2 similarity index 100% rename from test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 rename to test/regress/regress1/sets/deepmeas0.hs.fqout.cvc4.41.smt2 diff --git a/test/regress/regress0/sets/fuzz14418.smt2 b/test/regress/regress1/sets/fuzz14418.smt2 similarity index 100% rename from test/regress/regress0/sets/fuzz14418.smt2 rename to test/regress/regress1/sets/fuzz14418.smt2 diff --git a/test/regress/regress0/sets/fuzz15201.smt2 b/test/regress/regress1/sets/fuzz15201.smt2 similarity index 100% rename from test/regress/regress0/sets/fuzz15201.smt2 rename to test/regress/regress1/sets/fuzz15201.smt2 diff --git a/test/regress/regress0/sets/fuzz31811.smt2 b/test/regress/regress1/sets/fuzz31811.smt2 similarity index 100% rename from test/regress/regress0/sets/fuzz31811.smt2 rename to test/regress/regress1/sets/fuzz31811.smt2 diff --git a/test/regress/regress0/sets/jan24/insert_invariant_37_2.smt2 b/test/regress/regress1/sets/insert_invariant_37_2.smt2 similarity index 100% rename from test/regress/regress0/sets/jan24/insert_invariant_37_2.smt2 rename to test/regress/regress1/sets/insert_invariant_37_2.smt2 diff --git a/test/regress/regress0/sets/mar2014/lemmabug-ListElts317minimized.smt2 b/test/regress/regress1/sets/lemmabug-ListElts317minimized.smt2 similarity index 100% rename from test/regress/regress0/sets/mar2014/lemmabug-ListElts317minimized.smt2 rename to test/regress/regress1/sets/lemmabug-ListElts317minimized.smt2 diff --git a/test/regress/regress0/sets/jan24/remove_check_free_31_6.smt2 b/test/regress/regress1/sets/remove_check_free_31_6.smt2 similarity index 100% rename from test/regress/regress0/sets/jan24/remove_check_free_31_6.smt2 rename to test/regress/regress1/sets/remove_check_free_31_6.smt2 diff --git a/test/regress/regress0/sets/setofsets-disequal.smt2 b/test/regress/regress1/sets/setofsets-disequal.smt2 similarity index 100% rename from test/regress/regress0/sets/setofsets-disequal.smt2 rename to test/regress/regress1/sets/setofsets-disequal.smt2 diff --git a/test/regress/regress0/sets/sets-tuple-poly.cvc b/test/regress/regress1/sets/sets-tuple-poly.cvc similarity index 100% rename from test/regress/regress0/sets/sets-tuple-poly.cvc rename to test/regress/regress1/sets/sets-tuple-poly.cvc diff --git a/test/regress/regress0/sets/sharingbug.smt2 b/test/regress/regress1/sets/sharingbug.smt2 similarity index 100% rename from test/regress/regress0/sets/sharingbug.smt2 rename to test/regress/regress1/sets/sharingbug.smt2 diff --git a/test/regress/regress0/sets/univ-set-uf-elim.smt2 b/test/regress/regress1/sets/univ-set-uf-elim.smt2 similarity index 100% rename from test/regress/regress0/sets/univ-set-uf-elim.smt2 rename to test/regress/regress1/sets/univ-set-uf-elim.smt2 diff --git a/test/regress/regress0/simple-rdl-definefun.smt2 b/test/regress/regress1/simple-rdl-definefun.smt2 similarity index 100% rename from test/regress/regress0/simple-rdl-definefun.smt2 rename to test/regress/regress1/simple-rdl-definefun.smt2 diff --git a/test/regress/regress0/simplification_bug4.smt2 b/test/regress/regress1/simplification_bug4.smt2 similarity index 100% rename from test/regress/regress0/simplification_bug4.smt2 rename to test/regress/regress1/simplification_bug4.smt2 diff --git a/test/regress/regress0/simplification_bug4.smt2.expect b/test/regress/regress1/simplification_bug4.smt2.expect similarity index 100% rename from test/regress/regress0/simplification_bug4.smt2.expect rename to test/regress/regress1/simplification_bug4.smt2.expect diff --git a/test/regress/regress0/sqrt2-sort-inf-unk.smt2 b/test/regress/regress1/sqrt2-sort-inf-unk.smt2 similarity index 100% rename from test/regress/regress0/sqrt2-sort-inf-unk.smt2 rename to test/regress/regress1/sqrt2-sort-inf-unk.smt2 diff --git a/test/regress/regress1/strings/Makefile.am b/test/regress/regress1/strings/Makefile.am index 716e664b1..8ccf3f81d 100644 --- a/test/regress/regress1/strings/Makefile.am +++ b/test/regress/regress1/strings/Makefile.am @@ -18,9 +18,60 @@ endif # put it below in "TESTS +=" TESTS = \ cmu-5042-0707-2.smt2 \ - cmu-dis-0707-3.smt2 \ - cmu-prereg-fmf.smt2 \ - cmu-repl-len-nterm.smt2 + artemis-0512-nonterm.smt2 \ + bug615.smt2 \ + bug682.smt2 \ + bug686dd.smt2 \ + bug768.smt2 \ + bug799-min.smt2 \ + chapman150408.smt2 \ + cmu-disagree-0707-dd.smt2 \ + cmu-inc-nlpp-071516.smt2 \ + cmu-substr-rw.smt2 \ + crash-1019.smt2 \ + csp-prefix-exp-bug.smt2 \ + fmf001.smt2 \ + fmf002.smt2 \ + idof-nconst-index.smt2 \ + kaluza-fl.smt2 \ + loop007.smt2 \ + loop008.smt2 \ + loop009.smt2 \ + nf-ff-contains-abs.smt2 \ + norn-360.smt2 \ + norn-ab.smt2 \ + norn-nel-bug-052116.smt2 \ + pierre150331.smt2 \ + regexp001.smt2 \ + regexp002.smt2 \ + reloop.smt2 \ + str006.smt2 \ + strings-index-empty.smt2 \ + strip-endpt-sound.smt2 \ + substr001.smt2 \ + type002.smt2 \ + type003.smt2 \ + username_checker_min.smt2 \ + at001.smt2 \ + cmu-2db2-extf-reg.smt2 \ + gm-inc-071516-2.smt2 \ + idof-handg.smt2 \ + idof-neg-index.smt2 \ + idof-triv.smt2 \ + ilc-l-nt.smt2 \ + issue1105.smt2 \ + loop002.smt2 \ + loop003.smt2 \ + loop004.smt2 \ + loop005.smt2 \ + loop006.smt2 \ + norn-simp-rew-sat.smt2 \ + regexp003.smt2 \ + repl-empty-sem.smt2 \ + repl-soundness-sem.smt2 \ + str001.smt2 \ + str002.smt2 \ + str007.smt2 EXTRA_DIST = $(TESTS) diff --git a/test/regress/regress0/strings/artemis-0512-nonterm.smt2 b/test/regress/regress1/strings/artemis-0512-nonterm.smt2 similarity index 100% rename from test/regress/regress0/strings/artemis-0512-nonterm.smt2 rename to test/regress/regress1/strings/artemis-0512-nonterm.smt2 diff --git a/test/regress/regress0/strings/at001.smt2 b/test/regress/regress1/strings/at001.smt2 similarity index 100% rename from test/regress/regress0/strings/at001.smt2 rename to test/regress/regress1/strings/at001.smt2 diff --git a/test/regress/regress0/strings/bug615.smt2 b/test/regress/regress1/strings/bug615.smt2 similarity index 100% rename from test/regress/regress0/strings/bug615.smt2 rename to test/regress/regress1/strings/bug615.smt2 diff --git a/test/regress/regress0/strings/bug682.smt2 b/test/regress/regress1/strings/bug682.smt2 similarity index 100% rename from test/regress/regress0/strings/bug682.smt2 rename to test/regress/regress1/strings/bug682.smt2 diff --git a/test/regress/regress0/strings/bug686dd.smt2 b/test/regress/regress1/strings/bug686dd.smt2 similarity index 100% rename from test/regress/regress0/strings/bug686dd.smt2 rename to test/regress/regress1/strings/bug686dd.smt2 diff --git a/test/regress/regress0/strings/bug768.smt2 b/test/regress/regress1/strings/bug768.smt2 similarity index 100% rename from test/regress/regress0/strings/bug768.smt2 rename to test/regress/regress1/strings/bug768.smt2 diff --git a/test/regress/regress0/strings/bug799-min.smt2 b/test/regress/regress1/strings/bug799-min.smt2 similarity index 100% rename from test/regress/regress0/strings/bug799-min.smt2 rename to test/regress/regress1/strings/bug799-min.smt2 diff --git a/test/regress/regress0/strings/chapman150408.smt2 b/test/regress/regress1/strings/chapman150408.smt2 similarity index 100% rename from test/regress/regress0/strings/chapman150408.smt2 rename to test/regress/regress1/strings/chapman150408.smt2 diff --git a/test/regress/regress0/strings/cmu-2db2-extf-reg.smt2 b/test/regress/regress1/strings/cmu-2db2-extf-reg.smt2 similarity index 100% rename from test/regress/regress0/strings/cmu-2db2-extf-reg.smt2 rename to test/regress/regress1/strings/cmu-2db2-extf-reg.smt2 diff --git a/test/regress/regress0/strings/cmu-disagree-0707-dd.smt2 b/test/regress/regress1/strings/cmu-disagree-0707-dd.smt2 similarity index 100% rename from test/regress/regress0/strings/cmu-disagree-0707-dd.smt2 rename to test/regress/regress1/strings/cmu-disagree-0707-dd.smt2 diff --git a/test/regress/regress0/strings/cmu-inc-nlpp-071516.smt2 b/test/regress/regress1/strings/cmu-inc-nlpp-071516.smt2 similarity index 100% rename from test/regress/regress0/strings/cmu-inc-nlpp-071516.smt2 rename to test/regress/regress1/strings/cmu-inc-nlpp-071516.smt2 diff --git a/test/regress/regress0/strings/cmu-substr-rw.smt2 b/test/regress/regress1/strings/cmu-substr-rw.smt2 similarity index 100% rename from test/regress/regress0/strings/cmu-substr-rw.smt2 rename to test/regress/regress1/strings/cmu-substr-rw.smt2 diff --git a/test/regress/regress0/strings/crash-1019.smt2 b/test/regress/regress1/strings/crash-1019.smt2 similarity index 100% rename from test/regress/regress0/strings/crash-1019.smt2 rename to test/regress/regress1/strings/crash-1019.smt2 diff --git a/test/regress/regress0/strings/csp-prefix-exp-bug.smt2 b/test/regress/regress1/strings/csp-prefix-exp-bug.smt2 similarity index 100% rename from test/regress/regress0/strings/csp-prefix-exp-bug.smt2 rename to test/regress/regress1/strings/csp-prefix-exp-bug.smt2 diff --git a/test/regress/regress0/strings/fmf001.smt2 b/test/regress/regress1/strings/fmf001.smt2 similarity index 100% rename from test/regress/regress0/strings/fmf001.smt2 rename to test/regress/regress1/strings/fmf001.smt2 diff --git a/test/regress/regress0/strings/fmf002.smt2 b/test/regress/regress1/strings/fmf002.smt2 similarity index 100% rename from test/regress/regress0/strings/fmf002.smt2 rename to test/regress/regress1/strings/fmf002.smt2 diff --git a/test/regress/regress0/strings/gm-inc-071516-2.smt2 b/test/regress/regress1/strings/gm-inc-071516-2.smt2 similarity index 100% rename from test/regress/regress0/strings/gm-inc-071516-2.smt2 rename to test/regress/regress1/strings/gm-inc-071516-2.smt2 diff --git a/test/regress/regress0/strings/idof-handg.smt2 b/test/regress/regress1/strings/idof-handg.smt2 similarity index 100% rename from test/regress/regress0/strings/idof-handg.smt2 rename to test/regress/regress1/strings/idof-handg.smt2 diff --git a/test/regress/regress0/strings/idof-nconst-index.smt2 b/test/regress/regress1/strings/idof-nconst-index.smt2 similarity index 100% rename from test/regress/regress0/strings/idof-nconst-index.smt2 rename to test/regress/regress1/strings/idof-nconst-index.smt2 diff --git a/test/regress/regress0/strings/idof-neg-index.smt2 b/test/regress/regress1/strings/idof-neg-index.smt2 similarity index 100% rename from test/regress/regress0/strings/idof-neg-index.smt2 rename to test/regress/regress1/strings/idof-neg-index.smt2 diff --git a/test/regress/regress0/strings/idof-triv.smt2 b/test/regress/regress1/strings/idof-triv.smt2 similarity index 100% rename from test/regress/regress0/strings/idof-triv.smt2 rename to test/regress/regress1/strings/idof-triv.smt2 diff --git a/test/regress/regress0/strings/ilc-l-nt.smt2 b/test/regress/regress1/strings/ilc-l-nt.smt2 similarity index 100% rename from test/regress/regress0/strings/ilc-l-nt.smt2 rename to test/regress/regress1/strings/ilc-l-nt.smt2 diff --git a/test/regress/regress0/strings/issue1105.smt2 b/test/regress/regress1/strings/issue1105.smt2 similarity index 100% rename from test/regress/regress0/strings/issue1105.smt2 rename to test/regress/regress1/strings/issue1105.smt2 diff --git a/test/regress/regress0/strings/kaluza-fl.smt2 b/test/regress/regress1/strings/kaluza-fl.smt2 similarity index 100% rename from test/regress/regress0/strings/kaluza-fl.smt2 rename to test/regress/regress1/strings/kaluza-fl.smt2 diff --git a/test/regress/regress0/strings/loop002.smt2 b/test/regress/regress1/strings/loop002.smt2 similarity index 100% rename from test/regress/regress0/strings/loop002.smt2 rename to test/regress/regress1/strings/loop002.smt2 diff --git a/test/regress/regress0/strings/loop003.smt2 b/test/regress/regress1/strings/loop003.smt2 similarity index 100% rename from test/regress/regress0/strings/loop003.smt2 rename to test/regress/regress1/strings/loop003.smt2 diff --git a/test/regress/regress0/strings/loop004.smt2 b/test/regress/regress1/strings/loop004.smt2 similarity index 100% rename from test/regress/regress0/strings/loop004.smt2 rename to test/regress/regress1/strings/loop004.smt2 diff --git a/test/regress/regress0/strings/loop005.smt2 b/test/regress/regress1/strings/loop005.smt2 similarity index 100% rename from test/regress/regress0/strings/loop005.smt2 rename to test/regress/regress1/strings/loop005.smt2 diff --git a/test/regress/regress0/strings/loop006.smt2 b/test/regress/regress1/strings/loop006.smt2 similarity index 100% rename from test/regress/regress0/strings/loop006.smt2 rename to test/regress/regress1/strings/loop006.smt2 diff --git a/test/regress/regress0/strings/loop007.smt2 b/test/regress/regress1/strings/loop007.smt2 similarity index 100% rename from test/regress/regress0/strings/loop007.smt2 rename to test/regress/regress1/strings/loop007.smt2 diff --git a/test/regress/regress0/strings/loop008.smt2 b/test/regress/regress1/strings/loop008.smt2 similarity index 100% rename from test/regress/regress0/strings/loop008.smt2 rename to test/regress/regress1/strings/loop008.smt2 diff --git a/test/regress/regress0/strings/loop009.smt2 b/test/regress/regress1/strings/loop009.smt2 similarity index 100% rename from test/regress/regress0/strings/loop009.smt2 rename to test/regress/regress1/strings/loop009.smt2 diff --git a/test/regress/regress0/strings/nf-ff-contains-abs.smt2 b/test/regress/regress1/strings/nf-ff-contains-abs.smt2 similarity index 100% rename from test/regress/regress0/strings/nf-ff-contains-abs.smt2 rename to test/regress/regress1/strings/nf-ff-contains-abs.smt2 diff --git a/test/regress/regress0/strings/norn-360.smt2 b/test/regress/regress1/strings/norn-360.smt2 similarity index 100% rename from test/regress/regress0/strings/norn-360.smt2 rename to test/regress/regress1/strings/norn-360.smt2 diff --git a/test/regress/regress0/strings/norn-ab.smt2 b/test/regress/regress1/strings/norn-ab.smt2 similarity index 100% rename from test/regress/regress0/strings/norn-ab.smt2 rename to test/regress/regress1/strings/norn-ab.smt2 diff --git a/test/regress/regress0/strings/norn-nel-bug-052116.smt2 b/test/regress/regress1/strings/norn-nel-bug-052116.smt2 similarity index 100% rename from test/regress/regress0/strings/norn-nel-bug-052116.smt2 rename to test/regress/regress1/strings/norn-nel-bug-052116.smt2 diff --git a/test/regress/regress0/strings/norn-simp-rew-sat.smt2 b/test/regress/regress1/strings/norn-simp-rew-sat.smt2 similarity index 100% rename from test/regress/regress0/strings/norn-simp-rew-sat.smt2 rename to test/regress/regress1/strings/norn-simp-rew-sat.smt2 diff --git a/test/regress/regress0/strings/pierre150331.smt2 b/test/regress/regress1/strings/pierre150331.smt2 similarity index 100% rename from test/regress/regress0/strings/pierre150331.smt2 rename to test/regress/regress1/strings/pierre150331.smt2 diff --git a/test/regress/regress0/strings/regexp001.smt2 b/test/regress/regress1/strings/regexp001.smt2 similarity index 100% rename from test/regress/regress0/strings/regexp001.smt2 rename to test/regress/regress1/strings/regexp001.smt2 diff --git a/test/regress/regress0/strings/regexp002.smt2 b/test/regress/regress1/strings/regexp002.smt2 similarity index 100% rename from test/regress/regress0/strings/regexp002.smt2 rename to test/regress/regress1/strings/regexp002.smt2 diff --git a/test/regress/regress0/strings/regexp003.smt2 b/test/regress/regress1/strings/regexp003.smt2 similarity index 100% rename from test/regress/regress0/strings/regexp003.smt2 rename to test/regress/regress1/strings/regexp003.smt2 diff --git a/test/regress/regress0/strings/reloop.smt2 b/test/regress/regress1/strings/reloop.smt2 similarity index 100% rename from test/regress/regress0/strings/reloop.smt2 rename to test/regress/regress1/strings/reloop.smt2 diff --git a/test/regress/regress0/strings/repl-empty-sem.smt2 b/test/regress/regress1/strings/repl-empty-sem.smt2 similarity index 100% rename from test/regress/regress0/strings/repl-empty-sem.smt2 rename to test/regress/regress1/strings/repl-empty-sem.smt2 diff --git a/test/regress/regress0/strings/repl-soundness-sem.smt2 b/test/regress/regress1/strings/repl-soundness-sem.smt2 similarity index 100% rename from test/regress/regress0/strings/repl-soundness-sem.smt2 rename to test/regress/regress1/strings/repl-soundness-sem.smt2 diff --git a/test/regress/regress0/strings/str001.smt2 b/test/regress/regress1/strings/str001.smt2 similarity index 100% rename from test/regress/regress0/strings/str001.smt2 rename to test/regress/regress1/strings/str001.smt2 diff --git a/test/regress/regress0/strings/str002.smt2 b/test/regress/regress1/strings/str002.smt2 similarity index 100% rename from test/regress/regress0/strings/str002.smt2 rename to test/regress/regress1/strings/str002.smt2 diff --git a/test/regress/regress0/strings/str006.smt2 b/test/regress/regress1/strings/str006.smt2 similarity index 100% rename from test/regress/regress0/strings/str006.smt2 rename to test/regress/regress1/strings/str006.smt2 diff --git a/test/regress/regress0/strings/str007.smt2 b/test/regress/regress1/strings/str007.smt2 similarity index 100% rename from test/regress/regress0/strings/str007.smt2 rename to test/regress/regress1/strings/str007.smt2 diff --git a/test/regress/regress0/strings/strings-index-empty.smt2 b/test/regress/regress1/strings/strings-index-empty.smt2 similarity index 100% rename from test/regress/regress0/strings/strings-index-empty.smt2 rename to test/regress/regress1/strings/strings-index-empty.smt2 diff --git a/test/regress/regress0/strings/strip-endpt-sound.smt2 b/test/regress/regress1/strings/strip-endpt-sound.smt2 similarity index 100% rename from test/regress/regress0/strings/strip-endpt-sound.smt2 rename to test/regress/regress1/strings/strip-endpt-sound.smt2 diff --git a/test/regress/regress0/strings/substr001.smt2 b/test/regress/regress1/strings/substr001.smt2 similarity index 100% rename from test/regress/regress0/strings/substr001.smt2 rename to test/regress/regress1/strings/substr001.smt2 diff --git a/test/regress/regress0/strings/type002.smt2 b/test/regress/regress1/strings/type002.smt2 similarity index 100% rename from test/regress/regress0/strings/type002.smt2 rename to test/regress/regress1/strings/type002.smt2 diff --git a/test/regress/regress0/strings/type003.smt2 b/test/regress/regress1/strings/type003.smt2 similarity index 100% rename from test/regress/regress0/strings/type003.smt2 rename to test/regress/regress1/strings/type003.smt2 diff --git a/test/regress/regress0/strings/username_checker_min.smt2 b/test/regress/regress1/strings/username_checker_min.smt2 similarity index 100% rename from test/regress/regress0/strings/username_checker_min.smt2 rename to test/regress/regress1/strings/username_checker_min.smt2 diff --git a/test/regress/regress0/sygus/Base16_1.sy b/test/regress/regress1/sygus/Base16_1.sy similarity index 100% rename from test/regress/regress0/sygus/Base16_1.sy rename to test/regress/regress1/sygus/Base16_1.sy diff --git a/test/regress/regress1/sygus/Makefile.am b/test/regress/regress1/sygus/Makefile.am index b2a428bd1..c44c5034d 100644 --- a/test/regress/regress1/sygus/Makefile.am +++ b/test/regress/regress1/sygus/Makefile.am @@ -16,23 +16,61 @@ endif # These are run for all build profiles. # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" -TESTS = \ +TESTS = \ hd-sdiv.sy \ stopwatch-bt.sy \ - array_sum_dd.sy \ - mpg_guard1-dd.sy \ VC22_a.sy \ - inv_gen_n_c11.sy \ unbdd_inv_gen_ex7.sy \ - icfp_easy_mt_ite.sy \ - three.sy \ - nia-max-square.sy \ - MPwL_d1s3.sy \ - process-arg-invariance.sy \ real-grammar.sy \ - lustre-real.sy + cegar1.sy \ + cggmp.sy \ + clock-inc-tuple.sy \ + dup-op.sy \ + fg_polynomial3.sy \ + hd-01-d1-prog.sy \ + icfp_14.12.sy \ + icfp_14.12-flip-args.sy \ + icfp_28_10.sy \ + icfp_easy-ite.sy \ + inv-example.sy \ + inv-unused.sy \ + multi-fun-polynomial2.sy \ + no-flat-simp.sy \ + process-10-vars.sy \ + tl-type.sy \ + tl-type-4x.sy \ + twolets2-orig.sy \ + unbdd_inv_gen_winf1.sy \ + array_search_2.sy \ + array_sum_2_5.sy \ + commutative.sy \ + constant.sy \ + dt-test-ns.sy \ + hd-19-d1-prog-dup-op.sy \ + list-head-x.sy \ + max.sy \ + nflat-fwd-3.sy \ + nflat-fwd.sy \ + nia-max-square-ns.sy \ + no-mention.sy \ + qe.sy \ + strings-concat-3-args.sy \ + strings-double-rec.sy \ + strings-small.sy \ + strings-template-infer-unused.sy \ + strings-template-infer.sy \ + strings-trivial-simp.sy \ + strings-trivial-two-type.sy \ + strings-trivial.sy \ + sygus-dt.sy \ + tl-type-0.sy \ + triv-type-mismatch-si.sy \ + twolets1.sy -EXTRA_DIST = $(TESTS) +EXTRA_DIST = $(TESTS) \ + enum-test.sy + +# Base16_1.sy # synonyms for "check" in this directory .PHONY: regress regress1 test diff --git a/test/regress/regress0/sygus/array_search_2.sy b/test/regress/regress1/sygus/array_search_2.sy similarity index 100% rename from test/regress/regress0/sygus/array_search_2.sy rename to test/regress/regress1/sygus/array_search_2.sy diff --git a/test/regress/regress0/sygus/array_sum_2_5.sy b/test/regress/regress1/sygus/array_sum_2_5.sy similarity index 100% rename from test/regress/regress0/sygus/array_sum_2_5.sy rename to test/regress/regress1/sygus/array_sum_2_5.sy diff --git a/test/regress/regress0/sygus/cegar1.sy b/test/regress/regress1/sygus/cegar1.sy similarity index 100% rename from test/regress/regress0/sygus/cegar1.sy rename to test/regress/regress1/sygus/cegar1.sy diff --git a/test/regress/regress0/sygus/cggmp.sy b/test/regress/regress1/sygus/cggmp.sy similarity index 100% rename from test/regress/regress0/sygus/cggmp.sy rename to test/regress/regress1/sygus/cggmp.sy diff --git a/test/regress/regress0/sygus/clock-inc-tuple.sy b/test/regress/regress1/sygus/clock-inc-tuple.sy similarity index 100% rename from test/regress/regress0/sygus/clock-inc-tuple.sy rename to test/regress/regress1/sygus/clock-inc-tuple.sy diff --git a/test/regress/regress0/sygus/commutative.sy b/test/regress/regress1/sygus/commutative.sy similarity index 100% rename from test/regress/regress0/sygus/commutative.sy rename to test/regress/regress1/sygus/commutative.sy diff --git a/test/regress/regress0/sygus/constant.sy b/test/regress/regress1/sygus/constant.sy similarity index 100% rename from test/regress/regress0/sygus/constant.sy rename to test/regress/regress1/sygus/constant.sy diff --git a/test/regress/regress0/sygus/dt-test-ns.sy b/test/regress/regress1/sygus/dt-test-ns.sy similarity index 100% rename from test/regress/regress0/sygus/dt-test-ns.sy rename to test/regress/regress1/sygus/dt-test-ns.sy diff --git a/test/regress/regress0/sygus/dup-op.sy b/test/regress/regress1/sygus/dup-op.sy similarity index 100% rename from test/regress/regress0/sygus/dup-op.sy rename to test/regress/regress1/sygus/dup-op.sy diff --git a/test/regress/regress0/sygus/enum-test.sy b/test/regress/regress1/sygus/enum-test.sy similarity index 100% rename from test/regress/regress0/sygus/enum-test.sy rename to test/regress/regress1/sygus/enum-test.sy diff --git a/test/regress/regress0/sygus/fg_polynomial3.sy b/test/regress/regress1/sygus/fg_polynomial3.sy similarity index 100% rename from test/regress/regress0/sygus/fg_polynomial3.sy rename to test/regress/regress1/sygus/fg_polynomial3.sy diff --git a/test/regress/regress0/sygus/hd-01-d1-prog.sy b/test/regress/regress1/sygus/hd-01-d1-prog.sy similarity index 100% rename from test/regress/regress0/sygus/hd-01-d1-prog.sy rename to test/regress/regress1/sygus/hd-01-d1-prog.sy diff --git a/test/regress/regress0/sygus/hd-19-d1-prog-dup-op.sy b/test/regress/regress1/sygus/hd-19-d1-prog-dup-op.sy similarity index 100% rename from test/regress/regress0/sygus/hd-19-d1-prog-dup-op.sy rename to test/regress/regress1/sygus/hd-19-d1-prog-dup-op.sy diff --git a/test/regress/regress0/sygus/icfp_14.12-flip-args.sy b/test/regress/regress1/sygus/icfp_14.12-flip-args.sy similarity index 100% rename from test/regress/regress0/sygus/icfp_14.12-flip-args.sy rename to test/regress/regress1/sygus/icfp_14.12-flip-args.sy diff --git a/test/regress/regress0/sygus/icfp_14.12.sy b/test/regress/regress1/sygus/icfp_14.12.sy similarity index 100% rename from test/regress/regress0/sygus/icfp_14.12.sy rename to test/regress/regress1/sygus/icfp_14.12.sy diff --git a/test/regress/regress0/sygus/icfp_28_10.sy b/test/regress/regress1/sygus/icfp_28_10.sy similarity index 100% rename from test/regress/regress0/sygus/icfp_28_10.sy rename to test/regress/regress1/sygus/icfp_28_10.sy diff --git a/test/regress/regress0/sygus/icfp_easy-ite.sy b/test/regress/regress1/sygus/icfp_easy-ite.sy similarity index 100% rename from test/regress/regress0/sygus/icfp_easy-ite.sy rename to test/regress/regress1/sygus/icfp_easy-ite.sy diff --git a/test/regress/regress0/sygus/inv-example.sy b/test/regress/regress1/sygus/inv-example.sy similarity index 100% rename from test/regress/regress0/sygus/inv-example.sy rename to test/regress/regress1/sygus/inv-example.sy diff --git a/test/regress/regress0/sygus/inv-unused.sy b/test/regress/regress1/sygus/inv-unused.sy similarity index 100% rename from test/regress/regress0/sygus/inv-unused.sy rename to test/regress/regress1/sygus/inv-unused.sy diff --git a/test/regress/regress0/sygus/list-head-x.sy b/test/regress/regress1/sygus/list-head-x.sy similarity index 100% rename from test/regress/regress0/sygus/list-head-x.sy rename to test/regress/regress1/sygus/list-head-x.sy diff --git a/test/regress/regress0/sygus/max.sy b/test/regress/regress1/sygus/max.sy similarity index 100% rename from test/regress/regress0/sygus/max.sy rename to test/regress/regress1/sygus/max.sy diff --git a/test/regress/regress0/sygus/multi-fun-polynomial2.sy b/test/regress/regress1/sygus/multi-fun-polynomial2.sy similarity index 100% rename from test/regress/regress0/sygus/multi-fun-polynomial2.sy rename to test/regress/regress1/sygus/multi-fun-polynomial2.sy diff --git a/test/regress/regress0/sygus/nflat-fwd-3.sy b/test/regress/regress1/sygus/nflat-fwd-3.sy similarity index 100% rename from test/regress/regress0/sygus/nflat-fwd-3.sy rename to test/regress/regress1/sygus/nflat-fwd-3.sy diff --git a/test/regress/regress0/sygus/nflat-fwd.sy b/test/regress/regress1/sygus/nflat-fwd.sy similarity index 100% rename from test/regress/regress0/sygus/nflat-fwd.sy rename to test/regress/regress1/sygus/nflat-fwd.sy diff --git a/test/regress/regress0/sygus/nia-max-square-ns.sy b/test/regress/regress1/sygus/nia-max-square-ns.sy similarity index 100% rename from test/regress/regress0/sygus/nia-max-square-ns.sy rename to test/regress/regress1/sygus/nia-max-square-ns.sy diff --git a/test/regress/regress0/sygus/no-flat-simp.sy b/test/regress/regress1/sygus/no-flat-simp.sy similarity index 100% rename from test/regress/regress0/sygus/no-flat-simp.sy rename to test/regress/regress1/sygus/no-flat-simp.sy diff --git a/test/regress/regress0/sygus/no-mention.sy b/test/regress/regress1/sygus/no-mention.sy similarity index 100% rename from test/regress/regress0/sygus/no-mention.sy rename to test/regress/regress1/sygus/no-mention.sy diff --git a/test/regress/regress0/sygus/process-10-vars.sy b/test/regress/regress1/sygus/process-10-vars.sy similarity index 100% rename from test/regress/regress0/sygus/process-10-vars.sy rename to test/regress/regress1/sygus/process-10-vars.sy diff --git a/test/regress/regress0/sygus/qe.sy b/test/regress/regress1/sygus/qe.sy similarity index 100% rename from test/regress/regress0/sygus/qe.sy rename to test/regress/regress1/sygus/qe.sy diff --git a/test/regress/regress0/sygus/strings-concat-3-args.sy b/test/regress/regress1/sygus/strings-concat-3-args.sy similarity index 100% rename from test/regress/regress0/sygus/strings-concat-3-args.sy rename to test/regress/regress1/sygus/strings-concat-3-args.sy diff --git a/test/regress/regress0/sygus/strings-double-rec.sy b/test/regress/regress1/sygus/strings-double-rec.sy similarity index 100% rename from test/regress/regress0/sygus/strings-double-rec.sy rename to test/regress/regress1/sygus/strings-double-rec.sy diff --git a/test/regress/regress0/sygus/strings-small.sy b/test/regress/regress1/sygus/strings-small.sy similarity index 100% rename from test/regress/regress0/sygus/strings-small.sy rename to test/regress/regress1/sygus/strings-small.sy diff --git a/test/regress/regress0/sygus/strings-template-infer-unused.sy b/test/regress/regress1/sygus/strings-template-infer-unused.sy similarity index 100% rename from test/regress/regress0/sygus/strings-template-infer-unused.sy rename to test/regress/regress1/sygus/strings-template-infer-unused.sy diff --git a/test/regress/regress0/sygus/strings-template-infer.sy b/test/regress/regress1/sygus/strings-template-infer.sy similarity index 100% rename from test/regress/regress0/sygus/strings-template-infer.sy rename to test/regress/regress1/sygus/strings-template-infer.sy diff --git a/test/regress/regress0/sygus/strings-trivial-simp.sy b/test/regress/regress1/sygus/strings-trivial-simp.sy similarity index 100% rename from test/regress/regress0/sygus/strings-trivial-simp.sy rename to test/regress/regress1/sygus/strings-trivial-simp.sy diff --git a/test/regress/regress0/sygus/strings-trivial-two-type.sy b/test/regress/regress1/sygus/strings-trivial-two-type.sy similarity index 100% rename from test/regress/regress0/sygus/strings-trivial-two-type.sy rename to test/regress/regress1/sygus/strings-trivial-two-type.sy diff --git a/test/regress/regress0/sygus/strings-trivial.sy b/test/regress/regress1/sygus/strings-trivial.sy similarity index 100% rename from test/regress/regress0/sygus/strings-trivial.sy rename to test/regress/regress1/sygus/strings-trivial.sy diff --git a/test/regress/regress0/sygus/sygus-dt.sy b/test/regress/regress1/sygus/sygus-dt.sy similarity index 100% rename from test/regress/regress0/sygus/sygus-dt.sy rename to test/regress/regress1/sygus/sygus-dt.sy diff --git a/test/regress/regress0/sygus/tl-type-0.sy b/test/regress/regress1/sygus/tl-type-0.sy similarity index 100% rename from test/regress/regress0/sygus/tl-type-0.sy rename to test/regress/regress1/sygus/tl-type-0.sy diff --git a/test/regress/regress0/sygus/tl-type-4x.sy b/test/regress/regress1/sygus/tl-type-4x.sy similarity index 100% rename from test/regress/regress0/sygus/tl-type-4x.sy rename to test/regress/regress1/sygus/tl-type-4x.sy diff --git a/test/regress/regress0/sygus/tl-type.sy b/test/regress/regress1/sygus/tl-type.sy similarity index 100% rename from test/regress/regress0/sygus/tl-type.sy rename to test/regress/regress1/sygus/tl-type.sy diff --git a/test/regress/regress0/sygus/triv-type-mismatch-si.sy b/test/regress/regress1/sygus/triv-type-mismatch-si.sy similarity index 100% rename from test/regress/regress0/sygus/triv-type-mismatch-si.sy rename to test/regress/regress1/sygus/triv-type-mismatch-si.sy diff --git a/test/regress/regress0/sygus/twolets1.sy b/test/regress/regress1/sygus/twolets1.sy similarity index 100% rename from test/regress/regress0/sygus/twolets1.sy rename to test/regress/regress1/sygus/twolets1.sy diff --git a/test/regress/regress0/sygus/twolets2-orig.sy b/test/regress/regress1/sygus/twolets2-orig.sy similarity index 100% rename from test/regress/regress0/sygus/twolets2-orig.sy rename to test/regress/regress1/sygus/twolets2-orig.sy diff --git a/test/regress/regress0/sygus/unbdd_inv_gen_winf1.sy b/test/regress/regress1/sygus/unbdd_inv_gen_winf1.sy similarity index 100% rename from test/regress/regress0/sygus/unbdd_inv_gen_winf1.sy rename to test/regress/regress1/sygus/unbdd_inv_gen_winf1.sy diff --git a/test/regress/regress0/test12.cvc b/test/regress/regress1/test12.cvc similarity index 100% rename from test/regress/regress0/test12.cvc rename to test/regress/regress1/test12.cvc diff --git a/test/regress/regress0/trim.cvc b/test/regress/regress1/trim.cvc similarity index 100% rename from test/regress/regress0/trim.cvc rename to test/regress/regress1/trim.cvc diff --git a/test/regress/regress0/unconstrained/uf2.smt2 b/test/regress/regress1/uf2.smt2 similarity index 100% rename from test/regress/regress0/unconstrained/uf2.smt2 rename to test/regress/regress1/uf2.smt2 diff --git a/test/regress/regress0/uflia/DRAGON_11_e1_2450.ec.minimized.smt2 b/test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2 similarity index 100% rename from test/regress/regress0/uflia/DRAGON_11_e1_2450.ec.minimized.smt2 rename to test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2 diff --git a/test/regress/regress0/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect b/test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect similarity index 100% rename from test/regress/regress0/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect rename to test/regress/regress1/uflia/DRAGON_11_e1_2450.ec.minimized.smt2.expect diff --git a/test/regress/regress0/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 b/test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 similarity index 100% rename from test/regress/regress0/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 rename to test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 diff --git a/test/regress/regress0/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect b/test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect similarity index 100% rename from test/regress/regress0/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect rename to test/regress/regress1/uflia/FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect diff --git a/test/regress/regress0/uflia/FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 b/test/regress/regress1/uflia/FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 similarity index 100% rename from test/regress/regress0/uflia/FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 rename to test/regress/regress1/uflia/FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 diff --git a/test/regress/regress1/uflia/Makefile.am b/test/regress/regress1/uflia/Makefile.am new file mode 100644 index 000000000..c9a5ee372 --- /dev/null +++ b/test/regress/regress1/uflia/Makefile.am @@ -0,0 +1,41 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + FIREFLY_luke_1b_e2_3049_e7_1173.ec.minimized.smt2 \ + microwave21.ec.minimized.smt2 \ + simple_cyclic2.smt2 \ + DRAGON_11_e1_2450.ec.minimized.smt2 \ + FIREFLY_3_e2_2236_e7_3681.ec.core.smt2 \ + speed2_e8_449_e8_517.ec.smt2 \ + stalmark_e7_27_e7_31.ec.smt2 + + +EXTRA_DIST = $(TESTS) \ + DRAGON_11_e1_2450.ec.minimized.smt2.expect \ + FIREFLY_3_e2_2236_e7_3681.ec.core.smt2.expect \ + speed2_e8_449_e8_517.ec.smt2.expect \ + stalmark_e7_27_e7_31.ec.smt2.expect + +# synonyms for "check" in this directory +.PHONY: regress regress1 test +regress regress1 test: check + +# do nothing in this subdir +.PHONY: regress0 regress2 regress3 regress4 +regress0 regress2 regress3 regress4: diff --git a/test/regress/regress0/uflia/microwave21.ec.minimized.smt2 b/test/regress/regress1/uflia/microwave21.ec.minimized.smt2 similarity index 100% rename from test/regress/regress0/uflia/microwave21.ec.minimized.smt2 rename to test/regress/regress1/uflia/microwave21.ec.minimized.smt2 diff --git a/test/regress/regress0/uflia/simple_cyclic2.smt2 b/test/regress/regress1/uflia/simple_cyclic2.smt2 similarity index 100% rename from test/regress/regress0/uflia/simple_cyclic2.smt2 rename to test/regress/regress1/uflia/simple_cyclic2.smt2 diff --git a/test/regress/regress0/uflia/speed2_e8_449_e8_517.ec.smt2 b/test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2 similarity index 100% rename from test/regress/regress0/uflia/speed2_e8_449_e8_517.ec.smt2 rename to test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2 diff --git a/test/regress/regress0/uflia/speed2_e8_449_e8_517.ec.smt2.expect b/test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2.expect similarity index 100% rename from test/regress/regress0/uflia/speed2_e8_449_e8_517.ec.smt2.expect rename to test/regress/regress1/uflia/speed2_e8_449_e8_517.ec.smt2.expect diff --git a/test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.smt2 b/test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2 similarity index 100% rename from test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.smt2 rename to test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2 diff --git a/test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.smt2.expect b/test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2.expect similarity index 100% rename from test/regress/regress0/uflia/stalmark_e7_27_e7_31.ec.smt2.expect rename to test/regress/regress1/uflia/stalmark_e7_27_e7_31.ec.smt2.expect diff --git a/test/regress/regress2/Makefile.am b/test/regress/regress2/Makefile.am index 72c66a0b9..144a2225c 100644 --- a/test/regress/regress2/Makefile.am +++ b/test/regress/regress2/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . arith +SUBDIRS = . arith nl quantifiers strings sygus # don't override a BINARY imported from a personal.mk @mk_if@eq ($(BINARY),) @@ -20,7 +20,8 @@ MAKEFLAGS = -k # These are run for all build profiles. # If a test shouldn't be run in e.g. competition mode, # put it below in "TESTS +=" -TESTS = bug136.smt \ +TESTS = \ + bug136.smt \ bug148.smt \ bug394.smt2 \ DTP_k2_n35_c175_s15.smt2 \ @@ -44,12 +45,18 @@ TESTS = bug136.smt \ xs-09-16-3-4-1-5.smt \ xs-09-16-3-4-1-5.decn.smt \ uflia-error0.smt2 \ - bug812.smt2 + bug812.smt2 \ + bug765.smt2 \ + simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 \ + bug674.smt2 EXTRA_DIST = $(TESTS) \ FIREFLY_3_e2_2236_e7_3681.ec.minimized.smt2.expect \ uflia-error0.smt2.expect \ - xs-09-16-3-4-1-5.decn.smt.expect + xs-09-16-3-4-1-5.decn.smt.expect \ + bug396.smt2 \ + javafe.ast.StandardPrettyPrint.319_no_forall.smt2 \ + javafe.ast.WhileStmt.447_no_forall.smt2 #if CVC4_BUILD_PROFILE_COMPETITION #else diff --git a/test/regress/regress2/arith/Makefile.am b/test/regress/regress2/arith/Makefile.am index 82d4588c0..1bfad1dc3 100644 --- a/test/regress/regress2/arith/Makefile.am +++ b/test/regress/regress2/arith/Makefile.am @@ -26,7 +26,11 @@ TESTS = \ lpsat-goal-9.smt2 \ prp-13-24.smt2 -EXTRA_DIST = $(TESTS) + +EXTRA_DIST = $(TESTS) \ + miplib-opt1217--27.smt2 \ + miplib-pp08a-3000.smt2 \ + arith-int-098.cvc # synonyms for "check" in this directory .PHONY: regress regress2 test diff --git a/test/regress/regress0/arith/integers/arith-int-098.cvc b/test/regress/regress2/arith/arith-int-098.cvc similarity index 100% rename from test/regress/regress0/arith/integers/arith-int-098.cvc rename to test/regress/regress2/arith/arith-int-098.cvc diff --git a/test/regress/regress0/arith/miplib-opt1217--27.smt2 b/test/regress/regress2/arith/miplib-opt1217--27.smt2 similarity index 100% rename from test/regress/regress0/arith/miplib-opt1217--27.smt2 rename to test/regress/regress2/arith/miplib-opt1217--27.smt2 diff --git a/test/regress/regress0/arith/miplib-pp08a-3000.smt2 b/test/regress/regress2/arith/miplib-pp08a-3000.smt2 similarity index 100% rename from test/regress/regress0/arith/miplib-pp08a-3000.smt2 rename to test/regress/regress2/arith/miplib-pp08a-3000.smt2 diff --git a/test/regress/regress0/push-pop/bug396.smt2 b/test/regress/regress2/bug396.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug396.smt2 rename to test/regress/regress2/bug396.smt2 diff --git a/test/regress/regress0/push-pop/bug674.smt2 b/test/regress/regress2/bug674.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug674.smt2 rename to test/regress/regress2/bug674.smt2 diff --git a/test/regress/regress0/push-pop/bug765.smt2 b/test/regress/regress2/bug765.smt2 similarity index 100% rename from test/regress/regress0/push-pop/bug765.smt2 rename to test/regress/regress2/bug765.smt2 diff --git a/test/regress/regress0/uflia/javafe.ast.StandardPrettyPrint.319_no_forall.smt2 b/test/regress/regress2/javafe.ast.StandardPrettyPrint.319_no_forall.smt2 similarity index 100% rename from test/regress/regress0/uflia/javafe.ast.StandardPrettyPrint.319_no_forall.smt2 rename to test/regress/regress2/javafe.ast.StandardPrettyPrint.319_no_forall.smt2 diff --git a/test/regress/regress0/uflia/javafe.ast.WhileStmt.447_no_forall.smt2 b/test/regress/regress2/javafe.ast.WhileStmt.447_no_forall.smt2 similarity index 100% rename from test/regress/regress0/uflia/javafe.ast.WhileStmt.447_no_forall.smt2 rename to test/regress/regress2/javafe.ast.WhileStmt.447_no_forall.smt2 diff --git a/test/regress/regress2/nl/Makefile.am b/test/regress/regress2/nl/Makefile.am new file mode 100644 index 000000000..246473831 --- /dev/null +++ b/test/regress/regress2/nl/Makefile.am @@ -0,0 +1,33 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + siegel-nl-bases.smt2 + + +EXTRA_DIST = $(TESTS) \ + dumortier-050317.smt2 \ + nt-lemmas-bad.smt2 + +# synonyms for "check" in this directory +.PHONY: regress regress2 test +regress regress2 test: check + +# do nothing in this subdir +.PHONY: regress0 regress1 regress3 regress4 +regress0 regress1 regress3 regress4: diff --git a/test/regress/regress0/nl/nta/dumortier-050317.smt2 b/test/regress/regress2/nl/dumortier-050317.smt2 similarity index 100% rename from test/regress/regress0/nl/nta/dumortier-050317.smt2 rename to test/regress/regress2/nl/dumortier-050317.smt2 diff --git a/test/regress/regress0/nl/nt-lemmas-bad.smt2 b/test/regress/regress2/nl/nt-lemmas-bad.smt2 similarity index 100% rename from test/regress/regress0/nl/nt-lemmas-bad.smt2 rename to test/regress/regress2/nl/nt-lemmas-bad.smt2 diff --git a/test/regress/regress1/nl/siegel-nl-bases.smt2 b/test/regress/regress2/nl/siegel-nl-bases.smt2 similarity index 100% rename from test/regress/regress1/nl/siegel-nl-bases.smt2 rename to test/regress/regress2/nl/siegel-nl-bases.smt2 diff --git a/test/regress/regress0/quantifiers/AdditiveMethods_AdditiveMethods..ctor.smt2 b/test/regress/regress2/quantifiers/AdditiveMethods_AdditiveMethods..ctor.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/AdditiveMethods_AdditiveMethods..ctor.smt2 rename to test/regress/regress2/quantifiers/AdditiveMethods_AdditiveMethods..ctor.smt2 diff --git a/test/regress/regress1/fmf/ForElimination-scala-9.smt2 b/test/regress/regress2/quantifiers/ForElimination-scala-9.smt2 similarity index 100% rename from test/regress/regress1/fmf/ForElimination-scala-9.smt2 rename to test/regress/regress2/quantifiers/ForElimination-scala-9.smt2 diff --git a/test/regress/regress2/quantifiers/Makefile.am b/test/regress/regress2/quantifiers/Makefile.am new file mode 100644 index 000000000..19d1efb26 --- /dev/null +++ b/test/regress/regress2/quantifiers/Makefile.am @@ -0,0 +1,38 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + ForElimination-scala-9.smt2 \ + javafe.ast.ArrayInit.35.smt2 \ + javafe.ast.StandardPrettyPrint.319.smt2 \ + javafe.ast.WhileStmt.447.smt2 \ + javafe.tc.CheckCompilationUnit.001.smt2 \ + javafe.tc.FlowInsensitiveChecks.682.smt2 \ + nunchaku2309663.nun.min.smt2 \ + AdditiveMethods_AdditiveMethods..ctor.smt2 + +EXTRA_DIST = $(TESTS) \ + small-bug1-fixpoint-3.smt2 + +# synonyms for "check" in this directory +.PHONY: regress regress2 test +regress regress2 test: check + +# do nothing in this subdir +.PHONY: regress0 regress1 regress3 regress4 +regress0 regress1 regress3 regress4: diff --git a/test/regress/regress0/quantifiers/javafe.ast.ArrayInit.35.smt2 b/test/regress/regress2/quantifiers/javafe.ast.ArrayInit.35.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/javafe.ast.ArrayInit.35.smt2 rename to test/regress/regress2/quantifiers/javafe.ast.ArrayInit.35.smt2 diff --git a/test/regress/regress0/quantifiers/javafe.ast.StandardPrettyPrint.319.smt2 b/test/regress/regress2/quantifiers/javafe.ast.StandardPrettyPrint.319.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/javafe.ast.StandardPrettyPrint.319.smt2 rename to test/regress/regress2/quantifiers/javafe.ast.StandardPrettyPrint.319.smt2 diff --git a/test/regress/regress0/quantifiers/javafe.ast.WhileStmt.447.smt2 b/test/regress/regress2/quantifiers/javafe.ast.WhileStmt.447.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/javafe.ast.WhileStmt.447.smt2 rename to test/regress/regress2/quantifiers/javafe.ast.WhileStmt.447.smt2 diff --git a/test/regress/regress0/quantifiers/javafe.tc.CheckCompilationUnit.001.smt2 b/test/regress/regress2/quantifiers/javafe.tc.CheckCompilationUnit.001.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/javafe.tc.CheckCompilationUnit.001.smt2 rename to test/regress/regress2/quantifiers/javafe.tc.CheckCompilationUnit.001.smt2 diff --git a/test/regress/regress0/quantifiers/javafe.tc.FlowInsensitiveChecks.682.smt2 b/test/regress/regress2/quantifiers/javafe.tc.FlowInsensitiveChecks.682.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/javafe.tc.FlowInsensitiveChecks.682.smt2 rename to test/regress/regress2/quantifiers/javafe.tc.FlowInsensitiveChecks.682.smt2 diff --git a/test/regress/regress1/fmf/nunchaku2309663.nun.min.smt2 b/test/regress/regress2/quantifiers/nunchaku2309663.nun.min.smt2 similarity index 100% rename from test/regress/regress1/fmf/nunchaku2309663.nun.min.smt2 rename to test/regress/regress2/quantifiers/nunchaku2309663.nun.min.smt2 diff --git a/test/regress/regress0/quantifiers/small-bug1-fixpoint-3.smt2 b/test/regress/regress2/quantifiers/small-bug1-fixpoint-3.smt2 similarity index 100% rename from test/regress/regress0/quantifiers/small-bug1-fixpoint-3.smt2 rename to test/regress/regress2/quantifiers/small-bug1-fixpoint-3.smt2 diff --git a/test/regress/regress0/uflia/simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 b/test/regress/regress2/simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 similarity index 100% rename from test/regress/regress0/uflia/simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 rename to test/regress/regress2/simplify.javafe.ast.ArrayInit.35_without_quantification2.smt2 diff --git a/test/regress/regress2/strings/Makefile.am b/test/regress/regress2/strings/Makefile.am new file mode 100644 index 000000000..9b397699c --- /dev/null +++ b/test/regress/regress2/strings/Makefile.am @@ -0,0 +1,34 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + cmu-dis-0707-3.smt2 \ + cmu-prereg-fmf.smt2 \ + cmu-repl-len-nterm.smt2 + + +EXTRA_DIST = $(TESTS) \ + norn-dis-0707-3.smt2 + +# synonyms for "check" in this directory +.PHONY: regress regress2 test +regress regress2 test: check + +# do nothing in this subdir +.PHONY: regress0 regress1 regress3 regress4 +regress0 regress1 regress3 regress4: diff --git a/test/regress/regress1/strings/cmu-dis-0707-3.smt2 b/test/regress/regress2/strings/cmu-dis-0707-3.smt2 similarity index 100% rename from test/regress/regress1/strings/cmu-dis-0707-3.smt2 rename to test/regress/regress2/strings/cmu-dis-0707-3.smt2 diff --git a/test/regress/regress1/strings/cmu-prereg-fmf.smt2 b/test/regress/regress2/strings/cmu-prereg-fmf.smt2 similarity index 100% rename from test/regress/regress1/strings/cmu-prereg-fmf.smt2 rename to test/regress/regress2/strings/cmu-prereg-fmf.smt2 diff --git a/test/regress/regress1/strings/cmu-repl-len-nterm.smt2 b/test/regress/regress2/strings/cmu-repl-len-nterm.smt2 similarity index 100% rename from test/regress/regress1/strings/cmu-repl-len-nterm.smt2 rename to test/regress/regress2/strings/cmu-repl-len-nterm.smt2 diff --git a/test/regress/regress0/strings/norn-dis-0707-3.smt2 b/test/regress/regress2/strings/norn-dis-0707-3.smt2 similarity index 100% rename from test/regress/regress0/strings/norn-dis-0707-3.smt2 rename to test/regress/regress2/strings/norn-dis-0707-3.smt2 diff --git a/test/regress/regress1/sygus/MPwL_d1s3.sy b/test/regress/regress2/sygus/MPwL_d1s3.sy similarity index 100% rename from test/regress/regress1/sygus/MPwL_d1s3.sy rename to test/regress/regress2/sygus/MPwL_d1s3.sy diff --git a/test/regress/regress2/sygus/Makefile.am b/test/regress/regress2/sygus/Makefile.am new file mode 100644 index 000000000..02091c3bd --- /dev/null +++ b/test/regress/regress2/sygus/Makefile.am @@ -0,0 +1,42 @@ +# don't override a BINARY imported from a personal.mk +@mk_if@eq ($(BINARY),) +@mk_empty@BINARY = cvc4 +end@mk_if@ + +LOG_COMPILER = @srcdir@/../../run_regression +AM_LOG_FLAGS = $(RUN_REGRESSION_ARGS) @abs_top_builddir@/src/main/$(BINARY)$(EXEEXT) + +if AUTOMAKE_1_11 +# old-style (pre-automake 1.12) test harness +TESTS_ENVIRONMENT = \ + $(LOG_COMPILER) \ + $(AM_LOG_FLAGS) $(LOG_FLAGS) +endif + +# These are run for all build profiles. +# If a test shouldn't be run in e.g. competition mode, +# put it below in "TESTS +=" +TESTS = \ + array_sum_dd.sy \ + icfp_easy_mt_ite.sy \ + inv_gen_n_c11.sy \ + MPwL_d1s3.sy \ + nia-max-square.sy \ + no-syntax-test-no-si.sy \ + process-10-vars-2fun.sy \ + process-arg-invariance.sy \ + real-grammar-neg.sy \ + lustre-real.sy \ + max2-univ.sy \ + mpg_guard1-dd.sy \ + three.sy + +EXTRA_DIST = $(TESTS) + +# synonyms for "check" in this directory +.PHONY: regress regress2 test +regress regress2 test: check + +# do nothing in this subdir +.PHONY: regress0 regress1 regress3 regress4 +regress0 regress1 regress3 regress4: diff --git a/test/regress/regress1/sygus/array_sum_dd.sy b/test/regress/regress2/sygus/array_sum_dd.sy similarity index 100% rename from test/regress/regress1/sygus/array_sum_dd.sy rename to test/regress/regress2/sygus/array_sum_dd.sy diff --git a/test/regress/regress1/sygus/icfp_easy_mt_ite.sy b/test/regress/regress2/sygus/icfp_easy_mt_ite.sy similarity index 100% rename from test/regress/regress1/sygus/icfp_easy_mt_ite.sy rename to test/regress/regress2/sygus/icfp_easy_mt_ite.sy diff --git a/test/regress/regress1/sygus/inv_gen_n_c11.sy b/test/regress/regress2/sygus/inv_gen_n_c11.sy similarity index 100% rename from test/regress/regress1/sygus/inv_gen_n_c11.sy rename to test/regress/regress2/sygus/inv_gen_n_c11.sy diff --git a/test/regress/regress1/sygus/lustre-real.sy b/test/regress/regress2/sygus/lustre-real.sy similarity index 100% rename from test/regress/regress1/sygus/lustre-real.sy rename to test/regress/regress2/sygus/lustre-real.sy diff --git a/test/regress/regress0/sygus/max2-univ.sy b/test/regress/regress2/sygus/max2-univ.sy similarity index 100% rename from test/regress/regress0/sygus/max2-univ.sy rename to test/regress/regress2/sygus/max2-univ.sy diff --git a/test/regress/regress1/sygus/mpg_guard1-dd.sy b/test/regress/regress2/sygus/mpg_guard1-dd.sy similarity index 100% rename from test/regress/regress1/sygus/mpg_guard1-dd.sy rename to test/regress/regress2/sygus/mpg_guard1-dd.sy diff --git a/test/regress/regress1/sygus/nia-max-square.sy b/test/regress/regress2/sygus/nia-max-square.sy similarity index 100% rename from test/regress/regress1/sygus/nia-max-square.sy rename to test/regress/regress2/sygus/nia-max-square.sy diff --git a/test/regress/regress0/sygus/no-syntax-test-no-si.sy b/test/regress/regress2/sygus/no-syntax-test-no-si.sy similarity index 100% rename from test/regress/regress0/sygus/no-syntax-test-no-si.sy rename to test/regress/regress2/sygus/no-syntax-test-no-si.sy diff --git a/test/regress/regress0/sygus/process-10-vars-2fun.sy b/test/regress/regress2/sygus/process-10-vars-2fun.sy similarity index 100% rename from test/regress/regress0/sygus/process-10-vars-2fun.sy rename to test/regress/regress2/sygus/process-10-vars-2fun.sy diff --git a/test/regress/regress1/sygus/process-arg-invariance.sy b/test/regress/regress2/sygus/process-arg-invariance.sy similarity index 100% rename from test/regress/regress1/sygus/process-arg-invariance.sy rename to test/regress/regress2/sygus/process-arg-invariance.sy diff --git a/test/regress/regress0/sygus/real-grammar-neg.sy b/test/regress/regress2/sygus/real-grammar-neg.sy similarity index 100% rename from test/regress/regress0/sygus/real-grammar-neg.sy rename to test/regress/regress2/sygus/real-grammar-neg.sy diff --git a/test/regress/regress1/sygus/three.sy b/test/regress/regress2/sygus/three.sy similarity index 100% rename from test/regress/regress1/sygus/three.sy rename to test/regress/regress2/sygus/three.sy -- 2.30.2