Merge branch 'fix/test/saveloads' into 'master'

[tests] fixes test directives in two tests about save/load

Closes #1036

See merge request frama-c/frama-c!3120

tests/saveload/basic.i

@@ -3,12 +3,11 @@
    EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva @EVA_OPTIONS@ -out -input -deps ./@PTEST_DIR@/@PTEST_NAME@.i -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
    EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav ./bin/toplevel.opt -save ./tests/saveload/result/basic.1.sav @PTEST_DIR@/@PTEST_NAME@.i -eva @EVA_OPTIONS@ -out -input -deps > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
    STDOPT: +"-load ./tests/saveload/result/basic.sav -eva @EVA_OPTIONS@ -out -input -deps -journal-disable"
-   CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
-   STDOPT: +"-load ./tests/saveload/result/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps -journal-disable -print"
+   STDOPT: #"-load-module @PTEST_DIR@/@PTEST_NAME@.cmxs" +"-load ./tests/saveload/result/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps -journal-disable -print"
    STDOPT: +"-load ./tests/saveload/result/basic.1.sav -eva @EVA_OPTIONS@ -out -input -deps -journal-disable"
    EXECNOW: make -s @PTEST_DIR@/status.cmxs
    EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -load-module @PTEST_DIR@/status -save ./tests/saveload/result/status.sav @PTEST_DIR@/@PTEST_NAME@.i > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
-   STDOPT: +"-load-module @PTEST_DIR@/status -load ./tests/saveload/result/status.sav"
+   STDOPT: #"-load-module @PTEST_DIR@/status" +"-load ./tests/saveload/result/status.sav"
    STDOPT: +"-load ./tests/saveload/result/status.sav"
 */
 

tests/saveload/oracle/basic_sav.1.res

@@ -4,9 +4,9 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] tests/saveload/basic.i:19: assertion got status valid.
-[eva] tests/saveload/basic.i:20: starting to merge loop iterations
-[eva:alarm] tests/saveload/basic.i:20: Warning: 
+[eva] tests/saveload/basic.i:18: assertion got status valid.
+[eva] tests/saveload/basic.i:19: starting to merge loop iterations
+[eva:alarm] tests/saveload/basic.i:19: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] done for function main

tests/saveload/oracle/basic_sav.res

@@ -4,9 +4,9 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] tests/saveload/basic.i:19: assertion got status valid.
-[eva] tests/saveload/basic.i:20: starting to merge loop iterations
-[eva:alarm] tests/saveload/basic.i:20: Warning: 
+[eva] tests/saveload/basic.i:18: assertion got status valid.
+[eva] tests/saveload/basic.i:19: starting to merge loop iterations
+[eva:alarm] tests/saveload/basic.i:19: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] done for function main

tests/saveload/oracle/segfault_datatypes_sav.res

@@ -4,8 +4,8 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] tests/saveload/segfault_datatypes.i:13: starting to merge loop iterations
-[eva:alarm] tests/saveload/segfault_datatypes.i:13: Warning: 
+[eva] tests/saveload/segfault_datatypes.i:12: starting to merge loop iterations
+[eva:alarm] tests/saveload/segfault_datatypes.i:12: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] done for function main

tests/saveload/segfault_datatypes.i

-/* run.config
+/* run.config*
    EXECNOW: make -s ./tests/saveload/segfault_datatypes_A.cmxs ./tests/saveload/segfault_datatypes_B.cmxs
    EXECNOW: LOG segfault_datatypes_sav.res LOG segfault_datatypes_sav.err BIN segfault_datatypes.sav @frama-c@ -load-module ./tests/saveload/segfault_datatypes_A -eva @EVA_OPTIONS@ -out -input -deps ./tests/saveload/segfault_datatypes.i -save ./tests/saveload/result/segfault_datatypes.sav > ./tests/saveload/result/segfault_datatypes_sav.res 2> ./tests/saveload/result/segfault_datatypes_sav.err
-   CMD: @frama-c@ -load-module ./tests/saveload/segfault_datatypes_B
-   STDOPT: +"-load ./tests/saveload/result/segfault_datatypes.sav -eva @EVA_OPTIONS@ -out -input -deps -journal-disable"
+   STDOPT: +"-load-module ./tests/saveload/segfault_datatypes_B -load ./tests/saveload/result/segfault_datatypes.sav -eva -out -input -deps -journal-disable"
 */