From eb28078423ddc1af80d290d3489a3ab42fc84285 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 30 Sep 2020 11:05:05 +0200
Subject: [PATCH] takes benefit of tests/syntax/test_config options

---
 tests/syntax/Refresh_visitor.i                 | 2 +-
 tests/syntax/clone_test.i                      | 2 +-
 tests/syntax/enum_repr.i                       | 6 +++---
 tests/syntax/forloophook.i                     | 2 +-
 tests/syntax/formals_decl_leak.i               | 2 +-
 tests/syntax/get_astinfo_bts1136.i             | 2 +-
 tests/syntax/ghost_parameters_formals_status.i | 2 +-
 tests/syntax/inserted_casts.c                  | 4 ++--
 tests/syntax/logic_env.i                       | 2 +-
 tests/syntax/mutable_test.i                    | 2 +-
 tests/syntax/reorder.i                         | 2 +-
 tests/syntax/syntactic_hook.i                  | 2 +-
 tests/syntax/temporary_location.c              | 2 +-
 tests/syntax/transient_block.i                 | 2 +-
 tests/syntax/typedef_multi_1.c                 | 2 +-
 tests/syntax/vdescr_bts1387.i                  | 2 +-
 tests/syntax/visit_create_local.i              | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/syntax/Refresh_visitor.i b/tests/syntax/Refresh_visitor.i
index 0c8262c9371..bf37135a5d4 100644
--- a/tests/syntax/Refresh_visitor.i
+++ b/tests/syntax/Refresh_visitor.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: @EVA_OPTIONS@
+STDOPT: +"-no-print" +"@EVA_OPTIONS@"
 */
 
 struct S { int i; };
diff --git a/tests/syntax/clone_test.i b/tests/syntax/clone_test.i
index d712574d631..817c86742e8 100644
--- a/tests/syntax/clone_test.i
+++ b/tests/syntax/clone_test.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: #"-no-print"
+STDOPT: +"-no-print"
 */
 
 /*@
diff --git a/tests/syntax/enum_repr.i b/tests/syntax/enum_repr.i
index b6497c51777..349ba6bf539 100644
--- a/tests/syntax/enum_repr.i
+++ b/tests/syntax/enum_repr.i
@@ -1,8 +1,8 @@
 /* run.config
 MODULE: Enum_repr.cmxs
-OPT: -enums int -print
-OPT: -enums gcc-short-enums -print
-OPT: -enums gcc-enums -print
+STDOPT: #"-enums int"
+STDOPT: #"-enums gcc-short-enums"
+STDOPT: #"-enums gcc-enums"
 */
 
 // is represented by | int | gcc-enums          | gcc-short-enums 
diff --git a/tests/syntax/forloophook.i b/tests/syntax/forloophook.i
index 3d866b9e2a6..5f30bfede5a 100644
--- a/tests/syntax/forloophook.i
+++ b/tests/syntax/forloophook.i
@@ -1,6 +1,6 @@
 /* run.config
    MODULE: @PTEST_NAME@.cmxs
-   OPT: -no-autoload-plugins
+   STDOPT: +"-no-print"
 */
 void f() {
   for (int i=0; i< 10; i++);
diff --git a/tests/syntax/formals_decl_leak.i b/tests/syntax/formals_decl_leak.i
index 3f91eac76dc..c2aabc12d3c 100644
--- a/tests/syntax/formals_decl_leak.i
+++ b/tests/syntax/formals_decl_leak.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: -print %{dep:@PTEST_NAME@_1.i}
+STDOPT: +"%{dep:@PTEST_NAME@_1.i}"
 */
 
 void f(int x);
diff --git a/tests/syntax/get_astinfo_bts1136.i b/tests/syntax/get_astinfo_bts1136.i
index 28147c225aa..a3fd91fd90b 100644
--- a/tests/syntax/get_astinfo_bts1136.i
+++ b/tests/syntax/get_astinfo_bts1136.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: -no-autoload-plugins
+STDOPT: +"-no-print"
 */
 int f (int x) { return x; }
 int g (int x) { return x; }
diff --git a/tests/syntax/ghost_parameters_formals_status.i b/tests/syntax/ghost_parameters_formals_status.i
index b51483928e8..34cc9f87a2e 100644
--- a/tests/syntax/ghost_parameters_formals_status.i
+++ b/tests/syntax/ghost_parameters_formals_status.i
@@ -1,6 +1,6 @@
 /* run.config
   MODULE: @PTEST_NAME@.cmxs
-  OPT: -no-autoload-plugins
+  STDOPT: +"-no-print"
 */
 
 void declaration_void(void) /*@ ghost (int x, int y) */ ;
diff --git a/tests/syntax/inserted_casts.c b/tests/syntax/inserted_casts.c
index c8a2a0569b5..bfd93b57503 100644
--- a/tests/syntax/inserted_casts.c
+++ b/tests/syntax/inserted_casts.c
@@ -1,7 +1,7 @@
 /* run.config
    MODULE: @PTEST_NAME@.cmxs
-   STDOPT: +"-no-autoload-plugins"
-   STDOPT: +"-no-autoload-plugins" +"-machdep x86_64"
+   STDOPT:
+   STDOPT: +"-machdep x86_64"
 */
 #include "stddef.h"
 int f(int b)
diff --git a/tests/syntax/logic_env.i b/tests/syntax/logic_env.i
index 090fb281c8f..77996438a8a 100644
--- a/tests/syntax/logic_env.i
+++ b/tests/syntax/logic_env.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: logic_env_script.cmxs
-OPT: -no-autoload-plugins
+STDOPT: +"-no-print"
 */
 
 //@ predicate foo(integer x) = x == 0;
diff --git a/tests/syntax/mutable_test.i b/tests/syntax/mutable_test.i
index fe4050f2774..72ee8136fae 100644
--- a/tests/syntax/mutable_test.i
+++ b/tests/syntax/mutable_test.i
@@ -1,8 +1,8 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: -no-autoload-plugins -print
 */
 
+
 struct R_1 {
    int r ;
 };
diff --git a/tests/syntax/reorder.i b/tests/syntax/reorder.i
index 1199aeb932e..4c21aa075dd 100644
--- a/tests/syntax/reorder.i
+++ b/tests/syntax/reorder.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: -no-autoload-plugins
+STDOPT: +"-no-print"
 */
 
 int x;
diff --git a/tests/syntax/syntactic_hook.i b/tests/syntax/syntactic_hook.i
index f5a991909fd..14c005abb1e 100644
--- a/tests/syntax/syntactic_hook.i
+++ b/tests/syntax/syntactic_hook.i
@@ -1,7 +1,7 @@
 /* run.config
    MODULE: @PTEST_NAME@.cmxs
-   STDOPT: +"-no-autoload-plugins"
 */
+
 int f(void);
 
 int k(int *);
diff --git a/tests/syntax/temporary_location.c b/tests/syntax/temporary_location.c
index 23e0d72c35b..61b9e305759 100644
--- a/tests/syntax/temporary_location.c
+++ b/tests/syntax/temporary_location.c
@@ -1,8 +1,8 @@
 /* run.config
    MODULE: @PTEST_NAME@.cmxs
-   OPT: -print
 */
 
+
 int f(void) {
     return 1;
 }
diff --git a/tests/syntax/transient_block.i b/tests/syntax/transient_block.i
index 862cebdcc12..d14f12fce88 100644
--- a/tests/syntax/transient_block.i
+++ b/tests/syntax/transient_block.i
@@ -1,6 +1,6 @@
 /* run.config
    MODULE: @PTEST_NAME@.cmxs
-   OPT: -kernel-warn-key transient-block=active
+   STDOPT: +"-no-print" +"-kernel-warn-key transient-block=active"
 */
 
 void f(void) { }
diff --git a/tests/syntax/typedef_multi_1.c b/tests/syntax/typedef_multi_1.c
index b8785672af9..9e72ff0b87f 100644
--- a/tests/syntax/typedef_multi_1.c
+++ b/tests/syntax/typedef_multi_1.c
@@ -1,7 +1,7 @@
 /* run.config
    DEPS: typedef_multi.h
    MODULE: typedef_multi.cmxs
-   OPT: %{dep:typedef_multi_2.c}
+   STDOPT: +"-no-print" +"%{dep:typedef_multi_2.c}"
 */
 #include "typedef_multi.h"
 
diff --git a/tests/syntax/vdescr_bts1387.i b/tests/syntax/vdescr_bts1387.i
index 788665f995c..58ec73a2e6a 100644
--- a/tests/syntax/vdescr_bts1387.i
+++ b/tests/syntax/vdescr_bts1387.i
@@ -1,6 +1,6 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: #"-no-print"
+STDOPT: +"-no-print"
 */
 
 int f(int);
diff --git a/tests/syntax/visit_create_local.i b/tests/syntax/visit_create_local.i
index 178b62c4318..a1ff2d7355e 100644
--- a/tests/syntax/visit_create_local.i
+++ b/tests/syntax/visit_create_local.i
@@ -1,5 +1,5 @@
 /* run.config
 MODULE: @PTEST_NAME@.cmxs
-OPT: -then-on bidon -print
+STDOPT: +"-no-print -then-on bidon -print"
  */
 void main() { int x,y;  x = y; }
-- 
GitLab