Merge branch 'master' into issue6661issue6661

10 files changed, 10 insertions, 10 deletions

diff --git a/test/regress/regress2/bug394.smt2 b/test/regress/regress2/bug394.smt2
index 79fbf2e44..c0c8ca48c 100644
--- a/test/regress/regress2/bug394.smt2
+++ b/test/regress/regress2/bug394.smt2
@@ -15,7 +15,7 @@
 (set-option :print-success false)
 (set-info :smt-lib-version 2.6)
 ;(set-option :produce-models true)
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 ; done setting options
 
 ; Boogie universal background predicate
diff --git a/test/regress/regress2/bug674.smt2 b/test/regress/regress2/bug674.smt2
index cce0c963a..dc736539a 100644
--- a/test/regress/regress2/bug674.smt2
+++ b/test/regress/regress2/bug674.smt2
@@ -1,5 +1,5 @@
 ; COMMAND-LINE: --quant-ind --incremental
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (declare-datatypes ((Lst 0)) (((cons (head Int) (tail Lst)) (nil))))
 (define-fun-rec app ((l1 Lst) (l2 Lst)) Lst (ite ((_ is nil) l1) l2 (cons (head l1) (app (tail l1) l2))))
 (define-fun-rec rev ((l Lst)) Lst (ite ((_ is nil) l) nil (app (rev (tail l)) (cons (head l) nil))))
diff --git a/test/regress/regress2/bug765.smt2 b/test/regress/regress2/bug765.smt2
index 6c1c633a9..b0d85363d 100644
--- a/test/regress/regress2/bug765.smt2
+++ b/test/regress/regress2/bug765.smt2
@@ -1,5 +1,5 @@
 ; COMMAND-LINE: --incremental --fmf-fun-rlv --no-check-models
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 
 (declare-datatypes ((Color 0)) (
     ((red) (white) (blue))
diff --git a/test/regress/regress2/issue6495-dup-pat-term.smt2 b/test/regress/regress2/issue6495-dup-pat-term.smt2
index 3c8d0df61..c619bb37d 100644
--- a/test/regress/regress2/issue6495-dup-pat-term.smt2
+++ b/test/regress/regress2/issue6495-dup-pat-term.smt2
@@ -1,6 +1,6 @@
 ; COMMAND-LINE: -i -q

 ; EXPECT: unsat

-(set-logic ALL_SUPPORTED)

+(set-logic ALL)

 (set-info :status unsat)

 (declare-sort |T@[Int]Int| 0)

 (declare-datatypes ((T@Vec_2846 0)) (((Vec_2846 (|v#Vec_2846| |T@[Int]Int|) (|l#Vec_2846| Int) ) ) ))

diff --git a/test/regress/regress2/quantifiers/nunchaku2309663.nun.min.smt2 b/test/regress/regress2/quantifiers/nunchaku2309663.nun.min.smt2
index 2ae8a60f4..c6f8a1be2 100644
--- a/test/regress/regress2/quantifiers/nunchaku2309663.nun.min.smt2
+++ b/test/regress/regress2/quantifiers/nunchaku2309663.nun.min.smt2
@@ -1,6 +1,6 @@
 ; EXPECT: unsat
 ; COMMAND-LINE: --finite-model-find
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (set-info :status unsat)
 (declare-datatypes ((nat__ 0)) (((Suc__ (_select_Suc___0 nat__)) (zero__))))
 (declare-sort a__ 0)
diff --git a/test/regress/regress2/strings/cmu-dis-0707-3.smt2 b/test/regress/regress2/strings/cmu-dis-0707-3.smt2
index fcdcded39..4df45e833 100644
--- a/test/regress/regress2/strings/cmu-dis-0707-3.smt2
+++ b/test/regress/regress2/strings/cmu-dis-0707-3.smt2
@@ -1,5 +1,5 @@
 ; EXPECT: sat
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (set-info :status sat)
 (set-info :smt-lib-version 2.6)
 (set-option :strings-exp true)
diff --git a/test/regress/regress2/strings/cmu-disagree-0707-dd.smt2 b/test/regress/regress2/strings/cmu-disagree-0707-dd.smt2
index 140c7c659..02e5f6492 100644
--- a/test/regress/regress2/strings/cmu-disagree-0707-dd.smt2
+++ b/test/regress/regress2/strings/cmu-disagree-0707-dd.smt2
@@ -1,4 +1,4 @@
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (set-info :status sat)
 (set-option :strings-exp true)
 (set-option :strings-fmf true)
diff --git a/test/regress/regress2/strings/cmu-prereg-fmf.smt2 b/test/regress/regress2/strings/cmu-prereg-fmf.smt2
index 0d6827cf7..30ea49f4b 100644
--- a/test/regress/regress2/strings/cmu-prereg-fmf.smt2
+++ b/test/regress/regress2/strings/cmu-prereg-fmf.smt2
@@ -1,6 +1,6 @@
 ; COMMAND-LINE: --strings-exp --strings-fmf
 ; EXPECT: sat
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (set-info :status sat)
 
 (declare-fun url () String)
diff --git a/test/regress/regress2/strings/cmu-repl-len-nterm.smt2 b/test/regress/regress2/strings/cmu-repl-len-nterm.smt2
index 004db77ed..f55a61b2e 100644
--- a/test/regress/regress2/strings/cmu-repl-len-nterm.smt2
+++ b/test/regress/regress2/strings/cmu-repl-len-nterm.smt2
@@ -1,6 +1,6 @@
 ; COMMAND-LINE: --strings-exp
 ; EXPECT: sat
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (set-info :status sat)
 
 (declare-fun url () String)
diff --git a/test/regress/regress2/strings/issue3203.smt2 b/test/regress/regress2/strings/issue3203.smt2
index 6d4064ad5..f0bc8d031 100644
--- a/test/regress/regress2/strings/issue3203.smt2
+++ b/test/regress/regress2/strings/issue3203.smt2
@@ -1,6 +1,6 @@
 ; Temporarily disable checking of unsat cores (see issue #3606)
 ; COMMAND-LINE: --no-check-unsat-cores
-(set-logic ALL_SUPPORTED)
+(set-logic ALL)
 (set-option :strings-exp true)
 (set-info :status unsat)
 (declare-fun a () String)