[Tests] removing -load-script

ptests/ptests.ml

@@ -941,7 +941,7 @@ let command_string ~result_fmt ~oracle_fmt command =
     | Some _ -> (log_prefix ^ ".res.unfiltered-log"),(log_prefix ^ ".err.unfiltered-log")
   in
   let deps = command.deps in
-  let accepted_exit_code = Format.sprintf "with-accepted-exit-codes (or %d 1 4 125)" command.exit_code in
+  let accepted_exit_code = Format.sprintf "with-accepted-exit-codes (or %d 1 4)" command.exit_code in
   let command_string = basic_command_string command in
   Format.fprintf result_fmt
     "(rule ; TEST #%d OF TEST FILE %S\n  \

tests/cil/change_to_instr.i

 /* run.config
-OPT: -load-script %{dep:change_to_instr.ml} -print
+MODULE: @PTEST_NAME@
 */
 
 

tests/cil/queue_ghost_instr.i

 /* run.config
-OPT: -load-script %{dep:queue_ghost_instr.ml} -print
+MODULE: @PTEST_NAME@
 */
 
 

tests/journal/control.i

 /* run.config
    COMMENT: do not compare generated journals since they depend on current time
 
-  CMXS: abstract_cpt use_cpt
+  CMXS: abstract_cpt use_cpt control_journal control_journal_bis abstract_cpt_journal
 
   EXECNOW: BIN control_journal.ml @frama-c@ -journal-enable -eva -deps -out @EVA_OPTIONS@ -main f -journal-name control_journal.ml > /dev/null 2> /dev/null
-  OPT: -load-script %{dep:control_journal.ml}
+  OPT: -load-module %{dep:control_journal.cmxs}
 
   EXECNOW: BIN control_journal_bis.ml cp %{dep:control_journal.ml} control_journal_bis.ml > /dev/null 2> /dev/null
-  OPT: -load-script %{dep:control_journal_bis.ml} -calldeps
+  OPT: -load-module %{dep:control_journal_bis.cmxs} -calldeps
 
   EXECNOW: BIN abstract_cpt_journal.ml @frama-c-cmd@ -journal-enable -load-module %{dep:abstract_cpt.cmxs} -load-module %{dep:use_cpt.cmxs} -journal-name abstract_cpt_journal.ml > /dev/null 2> /dev/null
-  OPT: -load-script %{dep:abstract_cpt_journal.ml} -load-module %{dep:abstract_cpt.cmxs} -load-module %{dep:use_cpt.cmxs}
+  OPT: -load-module %{dep:abstract_cpt_journal.cmxs} -load-module %{dep:abstract_cpt.cmxs} -load-module %{dep:use_cpt.cmxs}
 */
 int x,y,c,d;
 void f() {

tests/journal/control2.c

 /* run.config
+  CMXS: control_journal_next2 control_journal2
   EXECNOW: BIN control_journal2.ml @frama-c@ -journal-enable -eva -deps -out -main f -journal-name control_journal2.ml > /dev/null 2> /dev/null
-  EXECNOW: LOG control2_sav.res LOG control2_sav.err BIN control_journal_next2.ml @frama-c@ -journal-enable -load-script %{dep:control_journal2.ml} -lib-entry -journal-name control_journal_next2.ml > control2_sav.res 2> control2_sav.err
+  EXECNOW: LOG control2_sav.res LOG control2_sav.err BIN control_journal_next2.ml @frama-c@ -journal-enable -load-module %{dep:control_journal2.cmxs} -lib-entry -journal-name control_journal_next2.ml > control2_sav.res 2> control2_sav.err
   PLUGIN: callgraph @EVA_CONFIG@
-  OPT: -load-script %{dep:control_journal_next2.ml}
+  OPT: -load-module %{dep:control_journal_next2.cmxs}
 */
 
 /* The last OPT was testing reading from byte when generated from native */
-
 int x,y,c,d;
 
 void f() {

tests/journal/intra.i

 /* run.config
    PLUGIN: sparecode @EVA_CONFIG@
-   CMXS: @PTEST_NAME@
+   CMXS: @PTEST_NAME@ intra_journal
    EXECNOW: BIN intra_journal.ml @frama-c@ -eva-show-progress -load-module %{dep:@PTEST_NAME@.cmxs} -journal-enable -journal-name intra_journal.ml > /dev/null 2> /dev/null
    CMD: @frama-c@ -load-module %{dep:@PTEST_NAME@.cmxs} @OPTIONS@
-   OPT: -load-script %{dep:intra_journal.ml} -journal-disable
+   OPT: -load-module %{dep:intra_journal.cmxs} -journal-disable
 */
 
 /* Waiting for results such as:

tests/journal/oracle/control2_sav.res

@@ -7,8 +7,8 @@
   y ∈ {0}
   c ∈ {0}
   d ∈ {0}
-[eva] control2.c:14: starting to merge loop iterations
-[eva:alarm] control2.c:17: Warning: 
+[eva] control2.c:15: starting to merge loop iterations
+[eva:alarm] control2.c:18: Warning: 
   signed overflow. assert x + 1 ≤ 2147483647;
 [eva] done for function f
 [eva] ====== VALUES COMPUTED ======
@@ -38,11 +38,11 @@
   y ∈ [--..--]
   c ∈ [--..--]
   d ∈ [--..--]
-[eva:alarm] control2.c:15: Warning: 
+[eva:alarm] control2.c:16: Warning: 
   signed overflow. assert y + 1 ≤ 2147483647;
-[eva:alarm] control2.c:15: Warning: 
+[eva:alarm] control2.c:16: Warning: 
   signed overflow. assert x + 1 ≤ 2147483647;
-[eva:alarm] control2.c:17: Warning: 
+[eva:alarm] control2.c:18: Warning: 
   signed overflow. assert x + 1 ≤ 2147483647;
 [eva] done for function f
 [eva] ====== VALUES COMPUTED ======

tests/misc/init_from_cil.i

 /* run.config
    MODULE: @PTEST_NAME@
-   OPT: 
+   OPT:
 */
 
 int f(int x);

tests/misc/interpreted_automata_dataflow.i

 /* run.config
-OPT: -load-script %{dep:interpreted_automata_dataflow.ml}
+MODULE: @PTEST_NAME@
+OPT: 
 */
 
 /* Tests the dataflow functor of interpreted automata via a caml script

tests/misc/pp_bin_hex.i

 /* run.config
-   OPT: -no-autoload-plugins -load-script %{dep:pp_bin_hex.ml}
+   MODULE: @PTEST_NAME@
+   OPT:
 */

tests/misc/pp_int.i

 /* run.config
    COMMENT: test of Integer.pp_bin and Integer.pp_hex
-   OPT: -load-script %{dep:pp_int.ml}
+   MODULE: @PTEST_NAME@
+   OPT: 
  */

tests/syntax/ghost_cv_var_decl.c

 /* run.config
+   CMXS: @PTEST_NAME@
    OPT:-cpp-extra-args="-DFAIL_DECL_TYPE"
-   OPT:-load-script %{dep:@PTEST_NAME@.ml}
+   OPT:-load-module %{dep:@PTEST_NAME@.cmxs}
 */
 
-
 /* When there is no comment, the code should be allowed */
 void f_ints(){
   int ng ;