From 62a52871ded4512024c32e3dc9eedf6cca2c35a6 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Mon, 3 Aug 2020 12:20:50 +0200
Subject: [PATCH] [e-acsl:tests] remove -e-acsl-prepare from tests
---
src/plugins/e-acsl/scripts/e-acsl-gcc.sh | 2 +-
src/plugins/e-acsl/tests/memory/local_init.c | 2 +-
src/plugins/e-acsl/tests/special/e-acsl-valid.c | 2 +-
src/plugins/e-acsl/tests/test_config_ci.in | 1 -
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/e-acsl/scripts/e-acsl-gcc.sh b/src/plugins/e-acsl/scripts/e-acsl-gcc.sh
index aeb097a74df..1ef4a37607d 100755
--- a/src/plugins/e-acsl/scripts/e-acsl-gcc.sh
+++ b/src/plugins/e-acsl/scripts/e-acsl-gcc.sh
@@ -557,7 +557,7 @@ do
--then)
shift;
OPTION_THEN=-then
- FRAMAC_FLAGS="-e-acsl-prepare $FRAMAC_FLAGS"
+ FRAMAC_FLAGS="$FRAMAC_FLAGS"
;;
# Extra E-ACSL options
--e-acsl-extra)
diff --git a/src/plugins/e-acsl/tests/memory/local_init.c b/src/plugins/e-acsl/tests/memory/local_init.c
index 483a08acdec..8de0529d5b4 100644
--- a/src/plugins/e-acsl/tests/memory/local_init.c
+++ b/src/plugins/e-acsl/tests/memory/local_init.c
@@ -1,7 +1,7 @@
/* run.config_ci
COMMENT: test of a local initializer which contains an annotation
LOG: gen_@PTEST_NAME@.c
- STDOPT: #"@MACHDEP@ @EACSL_PREPARE@ -lib-entry -eva -then -no-lib-entry"
+ STDOPT: #"@MACHDEP@ -lib-entry -eva -then -no-lib-entry"
*/
int X = 0;
diff --git a/src/plugins/e-acsl/tests/special/e-acsl-valid.c b/src/plugins/e-acsl/tests/special/e-acsl-valid.c
index 8cdb54fbcec..f13f228682c 100644
--- a/src/plugins/e-acsl/tests/special/e-acsl-valid.c
+++ b/src/plugins/e-acsl/tests/special/e-acsl-valid.c
@@ -1,6 +1,6 @@
/* run.config_ci, run.config_dev
COMMENT: test option -e-acsl-no-valid
- STDOPT: #"@MACHDEP@ @EACSL_PREPARE@ -eva -eva-verbose 0 -then -no-eva -e-acsl-no-valid"
+ STDOPT: #"@MACHDEP@ -eva -eva-verbose 0 -then -no-eva -e-acsl-no-valid"
MACRO: ROOT_EACSL_GCC_FC_EXTRA_EXT -eva -eva-verbose 0
MACRO: ROOT_EACSL_GCC_OPTS_EXT --then --e-acsl-extra -e-acsl-no-valid
*/
diff --git a/src/plugins/e-acsl/tests/test_config_ci.in b/src/plugins/e-acsl/tests/test_config_ci.in
index 2530bfd855a..2c9748e535a 100644
--- a/src/plugins/e-acsl/tests/test_config_ci.in
+++ b/src/plugins/e-acsl/tests/test_config_ci.in
@@ -1,6 +1,5 @@
MACRO: DEST @PTEST_RESULT@/gen_@PTEST_NAME@
MACRO: MACHDEP -machdep gcc_x86_64
-MACRO: EACSL_PREPARE -e-acsl-prepare -e-acsl-share ./share/e-acsl
MACRO: GLOBAL @MACHDEP@ -remove-unused-specified-functions -variadic-no-translation -verbose 0
MACRO: EACSL -e-acsl -e-acsl-share ./share/e-acsl -e-acsl-verbose 1
MACRO: EVA -eva -eva-no-alloc-returns-null -eva-no-results -eva-no-print -eva-warn-key libc:unsupported-spec=inactive
--
GitLab