[Tests] uniformization with master

src/plugins/nonterm/tests/nonterm/oracle/output_to_file.txt

-tests/nonterm/output_to_file.i:7:[nonterm] warning: non-terminating loop
-stack: loop :: tests/nonterm/output_to_file.i:11 <- main
-tests/nonterm/output_to_file.i:12:[nonterm] warning: unreachable return
+output_to_file.i:7:[nonterm] warning: non-terminating loop
+stack: loop :: output_to_file.i:11 <- main
+output_to_file.i:12:[nonterm] warning: unreachable return

src/plugins/server/tests/batch/ast_services.i

-/* run.config
-   EXIT: 1
+/* run.config*
+ EXIT: 1
    STDOPT:
 */
 

src/plugins/server/tests/batch/wrong.i

-/* run.config
+/* run.config*
  EXIT: 1
    STDOPT:
 */

src/plugins/variadic/tests/erroneous/no-param.i

 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT:
 */
 void f(...) // f must have at least one argument
@@ -11,4 +11,3 @@ int main()
 {
   f(0);
 }
-

src/plugins/variadic/tests/erroneous/not-enough-par.i

 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT:
 */
 int f(int a, int, int c,...);

src/plugins/variadic/tests/erroneous/variadic-builtin.i

-/* run.config
-   EXIT: 3
+/* run.config*
+ EXIT: 3
    STDOPT:
 */
 extern void Frama_C_show_each_warning(char const * , ...);

tests/cil/bts892.i

 /* run.config*
-   EXIT: 1
+ EXIT: 1
    STDOPT:
 */
 

tests/cil/ghost_cfg.c

 /* run.config
-   EXIT: 1
+ EXIT: 1
    OPT: -cpp-extra-args="-DCAN_CHECK"
    OPT: -cpp-extra-args="-DCANT_CHECK"
 */

tests/metrics/locals_size.i

 /* run.config
-  EXIT: 1
+ EXIT: 1
   OPT: -metrics-locals-size f,g,level3,level2,level1,main
   OPT: -metrics-locals-size recurse2
  */

tests/metrics/used-files.i

 /* run.config
-   EXIT: 1
+ EXIT: 1
    OPT: -metrics-used-files @PTEST_NAME@1.i @PTEST_NAME@2.i @PTEST_NAME@3.i @PTEST_NAME@4.i @PTEST_NAME@5.i @PTEST_NAME@6.i @PTEST_NAME@7.i @PTEST_NAME@8.i @PTEST_NAME@9.c @PTEST_NAME@1.h @PTEST_NAME@2.h
    OPT: -metrics-used-files -main g @PTEST_NAME@1.i @PTEST_NAME@2.i @PTEST_NAME@3.i @PTEST_NAME@4.i @PTEST_NAME@5.i @PTEST_NAME@6.i @PTEST_NAME@7.i @PTEST_NAME@8.i @PTEST_NAME@9.c @PTEST_NAME@1.h @PTEST_NAME@2.h
 */

tests/misc/bts0990_link.i

-/* run.config
+/* run.config*
  EXIT: 1
    OPT: %{dep:bts0990_link_1.i}
 */

tests/misc/custom_machdep.c

 /* run.config*
-EXIT: 1
-DEPS: __fc_machdep_custom.h
-MODULE: @PTEST_NAME@
-OPT: -cpp-extra-args="-D__FC_MACHDEP_CUSTOM" -machdep custom -print -then -print
-COMMENT: we need a -then to test double registering of a machdep
+ EXIT: 1
+  DEPS: __fc_machdep_custom.h
+  MODULE: @PTEST_NAME@
+  OPT: -cpp-extra-args="-D__FC_MACHDEP_CUSTOM" -machdep custom -print -then -print
+  COMMENT: we need a -then to test double registering of a machdep
 */
 #include "__fc_machdep_custom.h"
 // most of the following includes are not directly used, but they test if

tests/misc/debug_category.i

-/* run.config
+/* run.config*
 MODULE: Debug_category
 EXIT: 0
-OPT: -test-msg-key help -test-warn-key="a=inactive"
-OPT: -test-msg-key a -test-warn-key="a=inactive"
-OPT: -test-msg-key a -test-msg-key="-a:b" -test-warn-key="a=inactive"
-OPT: -test-msg-key a -test-msg-key="-a:b" -test-msg-key a:b:c -test-warn-key="a=inactive"
-OPT: -test-msg-key "a:b:c,d" -test-warn-key="a=inactive"
-OPT: -test-msg-key "*" -test-warn-key="a=inactive"
-OPT:
+  OPT: -test-msg-key help -test-warn-key="a=inactive"
+  OPT: -test-msg-key a -test-warn-key="a=inactive"
+  OPT: -test-msg-key a -test-msg-key="-a:b" -test-warn-key="a=inactive"
+  OPT: -test-msg-key a -test-msg-key="-a:b" -test-msg-key a:b:c -test-warn-key="a=inactive"
+  OPT: -test-msg-key "a:b:c,d" -test-warn-key="a=inactive"
+  OPT: -test-msg-key "*" -test-warn-key="a=inactive"
+  OPT:
 EXIT: 1
-OPT: -test-warn-key a=error
-OPT: -test-warn-key a=abort
+  OPT: -test-warn-key a=error
+  OPT: -test-warn-key a=abort
 EXIT: 0
-OPT: -test-warn-key a=feedback
+  OPT: -test-warn-key a=feedback
 EXIT: 1
-OPT: -test-warn-key="*=abort"
+  OPT: -test-warn-key="*=abort"
 EXIT: 0
-OPT: -test-warn-key=a=once
-OPT: -test-warn-key a=feedback-once
+  OPT: -test-warn-key=a=once
+  OPT: -test-warn-key a=feedback-once
 EXIT: 1
-OPT: -test-warn-key a=err-once
-OPT: -test-warn-key test-vis-err
-OPT: -test-warn-key test-inv-err
+  OPT: -test-warn-key a=err-once
+  OPT: -test-warn-key test-vis-err
+  OPT: -test-warn-key test-inv-err
 EXIT: 4
-OPT: -test-warn-key test-failure
+  OPT: -test-warn-key test-failure
 FILTER: sed 's|Your Frama-C version is.*|Your Frama-C version is VERSION|'
 */

tests/misc/function_ptr_lvalue_1.i

@@ -2,6 +2,8 @@
  EXIT: 1
    STDOPT:
 */
+
+
 void f(void) {}
 
 int main()

tests/misc/global_decl_loc2.i

-/* run.config
-   EXIT: 1
+/* run.config*
+ EXIT: 1
    LIBS: global_decl_loc
    OPT: @PTEST_DIR@/global_decl_loc.i
 */

tests/misc/log_selfrec.i

-/* run.config
+/* run.config*
    PLUGIN: report @PLUGIN@
  EXIT: 1
    OPT: -foobar -report-unclassified-error jazz

tests/misc/oracle/function_ptr_lvalue_1.res.oracle

 [kernel] Parsing function_ptr_lvalue_1.i (no preprocessing)
-[kernel] function_ptr_lvalue_1.i:11: User Error: 
+[kernel] function_ptr_lvalue_1.i:13: User Error: 
   Cannot assign to non-modifiable lval *p
 [kernel] User Error: stopping on file "function_ptr_lvalue_1.i" that has errors.
 [kernel] Frama-C aborted: invalid user input.

tests/spec/multiple_include_2.c

 /* run.config
-   EXIT: 1
+ EXIT: 1
    DEPS: multiple_include.h
    OPT: -kernel-warn-key=annot-error=active -print %{dep:multiple_include_1.c}
 */

tests/syntax/arg_type.i

-/* run.config
+/* run.config*
  EXIT: 1
    STDOPT: +"-machdep gcc_x86_32"
 */

tests/syntax/bad_return_bts_599.i

-/* run.config
+/* run.config*
  EXIT: 1
    STDOPT:
 */