diff --git a/tests/syntax/Refresh_visitor.i b/tests/syntax/Refresh_visitor.i index 0c8262c9371ce859bb21ad8e629588d98201c4ec..bf37135a5d4e2428372aaad53438c988a8edc37c 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 d712574d6316027428ef7e4031cfeb07c4e248c0..817c86742e8d5627904b2bc13a2f9c91ca67f91f 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 b6497c51777af496a5b7dceafa902b536340f1bc..349ba6bf539f00a9ef09bd7d2691cccb759e9b98 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 3d866b9e2a63ea6622cf1d0428493ccd53998781..5f30bfede5a341cbff8084211c06bb496240c178 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 3f91eac76dc2fbd97c1a2eb9aac5a0559ff88a70..c2aabc12d3c82ef1df955e34014b1aad5e8ab800 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 28147c225aaf5b4dfb3127343be0d488b4a8feb2..a3fd91fd90b614457b62e16098942af7530b5de6 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 b51483928e80431eac5c9063b6e0c23e7c044389..34cc9f87a2ef2b8ad5337053609e729f40190b3a 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 c8a2a0569b5507e9a29d3bd618bc0483c5e1801b..bfd93b575034e2cc0a5b5dd0668068b55da6d332 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 090fb281c8f283b69da20f52530bda4c9929f430..77996438a8aaff55466bb2d13ec17257c0c801c9 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 fe4050f277414eec61bfe8ec964dc220436e9c02..72ee8136fae1e1d61a046fb620a355f7eaa17743 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 1199aeb932e9cde121b928195e24a84f3eab793f..4c21aa075dd383133252e855e1314161da0c83e5 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 f5a991909fd664170edabb49416ad2550e62228c..14c005abb1e1ce46d9cdf2d29fb672bce186fe02 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 23e0d72c35b704c165249aa91b629db7e754d19d..61b9e305759aa64cfcb1d51d4908bba689ecd322 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 862cebdcc12e3653a7f3534a536a1cec08d99a3d..d14f12fce888b68c88f31e44294c2ae97cb48157 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 b8785672af9c5eef9dea5373d06ed98b3e37155e..9e72ff0b87f6401e8457d9f18c4d5d3f248f6d7e 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 788665f995cc75006d84c0e3eefecf01ad3af5fd..58ec73a2e6aff84918a79b4d506df156ee04fe75 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 178b62c4318aed958a6efb31d76981f3021211ad..a1ff2d7355e7ccae9822a0813add688763c2cec3 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; }