Merge branch 'feature/andre/refactor-tests' into 'master'

[tests] refactor tests to simplify future changes

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

Makefile

@@ -1082,6 +1082,7 @@ PLUGIN_NAME:=Pdg
 PLUGIN_DIR:=src/plugins/pdg
 PLUGIN_TESTS_LIB:=tests/pdg/dyn_dpds.ml \
                   tests/pdg/sets.ml
+PLUGIN_TESTS_DIRS:=pdg
 PLUGIN_CMO:= pdg_parameters \
 	    ctrlDpds \
 	    pdg_state \

tests/constant_propagation/array_pointers.i

 /* run.config
-   OPT: -eva -eva-show-progress -scf -eva-show-progress -journal-disable
+   STDOPT: +"-eva"
 */
 
 void *p;

tests/constant_propagation/bts-1787-bis.i

 /* run.config
-OPT: -journal-disable -print
-OPT: -journal-disable -scf -eva-show-progress
-OPT: -journal-disable -scf -eva-show-progress -scf-allow-cast
+   OPT: -print -journal-disable
+   STDOPT:
+   STDOPT: +"-scf-allow-cast"
 */
 
 typedef struct {

tests/constant_propagation/bts-1787.i

 /* run.config
-OPT: -journal-disable -scf -eva-show-progress -scf-allow-cast
-OPT: -journal-disable -scf -eva-show-progress
+   STDOPT: +"-scf-allow-cast"
+   STDOPT:
 */
 
 typedef struct {

tests/constant_propagation/const_field_return_struct.i

 /* run.config
-   OPT: -eva -eva-show-progress -scf -eva-show-progress -journal-disable
+   STDOPT: +"-eva"
 */
 
 struct S {

tests/constant_propagation/enum.i

 /* run.config
-OPT: -semantic-const-folding -eva-show-progress
+   STDOPT:
 */
 
 enum E { A, B, C, D };

tests/constant_propagation/fct_ptr.i

 /* run.config
-OPT: -scf -eva-show-progress -then-on propagated
+   STDOPT: +"-then-on propagated"
 */
 
 void (*pf)(void);

tests/constant_propagation/struct_field.i

 /* run.config
-   OPT: -eva -semantic-const-folding -eva-show-progress -journal-disable
+   STDOPT: +"-eva"
 */
 
 struct st {

tests/constant_propagation/test_config

+OPT: -journal-disable -scf -eva-show-progress

tests/pdg/annot.c

 /* run.config
-  OPT: -eva-show-progress -fct-pdg f1 -main f1 -journal-disable -pdg-print -pdg-verbose 2
-  OPT: -eva-show-progress -fct-pdg loop -main loop -journal-disable -pdg-print -pdg-verbose 2
+  STDOPT: +"-fct-pdg f1 -main f1"
+  STDOPT: +"-fct-pdg loop -main loop"
 */
 
 int G;

tests/pdg/array_struct.i

 /* run.config
-  OPT: -eva-show-progress -pdg -pdg-print -journal-disable -pdg-verbose 2
+  STDOPT: +"-pdg"
 */
 
 typedef struct {

tests/pdg/assigns.i

 /* run.config
-  OPT: -journal-disable -eva-show-progress -pdg -pdg-print -calldeps -pdg-verbose 2
+  STDOPT: +"-pdg -calldeps"
 */
 
 unsigned int x, y;

tests/pdg/bts1194.c

 /* run.config
-  OPT: -eva -inout -eva-show-progress -pdg -pdg-print -calldeps -deps -then -slice-return main -then-last -print -eva-show-progress
+  STDOPT: +"-eva -inout -pdg -calldeps -deps -then -slice-return main -then-last -print -eva-show-progress"
 */
 
 int Y, X;

tests/pdg/call.c

 /* run.config
    GCC:
-   OPT: -lib-entry -main g -eva-show-progress -pdg -pdg-dot tests/pdg/call  -journal-disable -pdg-print -pdg-verbose 2
+   STDOPT: +"-lib-entry -main g -pdg -pdg-dot tests/pdg/call "
 */
 
 /* Ne pas modifier : exemple utilisé dans le rapport. */

tests/pdg/calls_and_implicits.c

 /* run.config
  *    GCC:
- *    OPT: -eva-show-progress -fct-pdg main -inout -journal-disable -pdg-print -pdg-verbose 2
+ *    STDOPT: +"-fct-pdg main -inout"
  *
  */
 

tests/pdg/calls_and_struct.c

 /* run.config
    GCC:
-   OPT: -deps -input -out -inout -eva-show-progress -pdg -journal-disable -pdg-print -pdg-verbose 2
+   STDOPT: +"-deps -input -out -inout -pdg"
    */
 
 struct Tstr { int a; int b; int c; };

tests/pdg/const.i

 /* run.config
-  STDOPT: #" -load-module pdg -calldeps -eva-show-progress -pdg -pdg-print"
+  STDOPT: #"-eva -pdg -out -input -deps -calldeps -pdg"
 */
 
 struct T1 {

tests/pdg/decl_dpds.c

 /* run.config
    GCC:
-   OPT: -eva-show-progress -fct-pdg main -journal-disable -pdg-print -pdg-verbose 2
+   STDOPT: +"-fct-pdg main"
 */
 
 extern int G;

tests/pdg/doc_dot.c

 /* run.config
- OPT: -lib-entry -main g -eva-show-progress -fct-pdg g -pdg-dot tests/pdg/doc -journal-disable -pdg-print -pdg-verbose 2
+ STDOPT: +"-lib-entry -main g -fct-pdg g -pdg-dot tests/pdg/doc"
 */
 /* To build the svg file:
  * dot -Tsvg tests/pdg/doc.g.dot > tests/pdg/doc.g.svg

tests/pdg/dpds_intra.c

 /* run.config
    GCC:
-   OPT: -eva-show-progress -fct-pdg test_struct -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -eva-show-progress -fct-pdg test_if_simple -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -eva-show-progress -fct-pdg test_goto_simple -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -eva-show-progress -fct-pdg test_goto_arriere -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -eva-show-progress -fct-pdg test_goto_else -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -main test_ctrl_dpd_multiple  -journal-disable -pdg-print -pdg-verbose 2
+   STDOPT: +"-fct-pdg test_struct"
+   STDOPT: +"-fct-pdg test_if_simple"
+   STDOPT: +"-fct-pdg test_goto_simple"
+   STDOPT: +"-fct-pdg test_goto_arriere"
+   STDOPT: +"-fct-pdg test_goto_else"
+   STDOPT: +"-main test_ctrl_dpd_multiple "
         => ne passe pas
-   OPT: -eva-show-progress -fct-pdg test_simple_loop -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -eva-show-progress -fct-pdg main -journal-disable -pdg-print -pdg-verbose 2
-   OPT: -eva-show-progress -fct-pdg multiple_global_inputs -journal-disable -pdg-print -pdg-verbose 2
+   STDOPT: +"-fct-pdg test_simple_loop"
+   STDOPT: +"-fct-pdg main"
+   STDOPT: +"-fct-pdg multiple_global_inputs"
 */
 /* bin/toplevel.opt -deps -main g tests/slicing/dpds_intra.c */
-/* bin/toplevel.opt -eva-show-progress -fct-pdg test_goto_simple tests/slicing/dpds_intra.c -pdg-dot */
+/* bin/toplevel.opt -fct-pdg test_goto_simple tests/slicing/dpds_intra.c -pdg-dot */
 
 extern int G;