From 66b33b05933f79eda94ec20ed3e63be08e36fa26 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Fri, 29 Jan 2021 10:30:33 +0100
Subject: [PATCH] [Tests] finalize the merge about the tests.
---
src/plugins/wp/tests/ptests_config | 2 +-
src/plugins/wp/tests/wp_region/test_config | 10 ----------
tests/pdg/globals.c | 8 ++++----
tests/pdg/top_pdg_input.c | 2 +-
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/plugins/wp/tests/ptests_config b/src/plugins/wp/tests/ptests_config
index ea6b5a9baba..5c86b86909a 100644
--- a/src/plugins/wp/tests/ptests_config
+++ b/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
diff --git a/src/plugins/wp/tests/wp_region/test_config b/src/plugins/wp/tests/wp_region/test_config
index d2802e47118..cc353c1a376 100644
--- a/src/plugins/wp/tests/wp_region/test_config
+++ b/src/plugins/wp/tests/wp_region/test_config
@@ -1,13 +1,3 @@
-<<<<<<< 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
diff --git a/tests/pdg/globals.c b/tests/pdg/globals.c
index 390e3f947b7..295b43bb0a0 100644
--- a/tests/pdg/globals.c
+++ b/tests/pdg/globals.c
@@ -1,8 +1,8 @@
/* 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;
diff --git a/tests/pdg/top_pdg_input.c b/tests/pdg/top_pdg_input.c
index 1fa9bc58564..f0414696dc9 100644
--- a/tests/pdg/top_pdg_input.c
+++ b/tests/pdg/top_pdg_input.c
@@ -1,5 +1,5 @@
/* 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;}
--
GitLab