[Tests] finalize the merge about the tests.

src/plugins/wp/tests/ptests_config

@@ -2,7 +2,7 @@ DEFAULT_SUITES= wp wp_acsl wp_plugin wp_bts wp_store wp_hoare
 DEFAULT_SUITES= wp_typed wp_usage wp_gallery wp_manual wp_tip
 
 # todo: to fixes
-IGNORE= DEFAULT_SUITES= wp_region
+DEFAULT_SUITES= wp_region
 
 IGNORE= qualif_SUITES= wp wp_plugin wp_acsl wp_bts wp_store wp_hoare
 IGNORE= qualif_SUITES= wp_typed wp_usage wp_gallery wp_manual wp_tip wp_region

src/plugins/wp/tests/wp_region/test_config

-<<<<<<< HEAD
 CMD: @frama-c@ @OPTIONS@
 #LOG: @PTEST_NAME@/region/job.dot
 OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-warn-key pedantic-assigns=inactive -wp-out @PTEST_NAME@ -wp-fct job
-||||||| ac7807782d
-CMD: @frama-c@ -no-autoload-plugins -load-module wp
-LOG: @PTEST_NAME@/region/job.dot
-OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-out @PTEST_DIR@/result/@PTEST_NAME@ -wp-fct job
-=======
-CMD: @frama-c@ -no-autoload-plugins -load-module wp
-LOG: @PTEST_NAME@/region/job.dot
-OPT: -wp-prover none -wp-region -wp-msg-key dot,chunk,roots,garbled -wp-warn-key pedantic-assigns=inactive -wp-out @PTEST_DIR@/result/@PTEST_NAME@ -wp-fct job
->>>>>>> origin/master

tests/pdg/globals.c

 /* run.config
-  
-  STDOPT: #"-load-module pdg -eva -out -input -deps -main g"
-  STDOPT: #"-load-module pdg -eva -out -input -deps -main h"
-  STDOPT: #"-load-module pdg -eva -out -input -deps -main f"
+
+  STDOPT: #"-eva -out -input -deps -main g"
+  STDOPT: #"-eva -out -input -deps -main h"
+  STDOPT: #"-eva -out -input -deps -main f"
 */
 struct Tstr;
 extern int X;

tests/pdg/top_pdg_input.c

 /* run.config
-   STDOPT: +"-eva -pdg -out -input -deps -eva-no-results-function no_results -eva-no-builtins-auto -load-module pdg -pdg -then -main main_asm"
+   STDOPT: +"-eva -pdg -out -input -deps -eva-no-results-function no_results -eva-no-builtins-auto -pdg -then -main main_asm"
 */
 volatile int nondet;
 int no_results() {return 1;}