From 276ce8367cfa0f307ec8ba8a32df2971b1f25cfe Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Tue, 5 Oct 2021 17:01:43 +0200
Subject: [PATCH] [Tests] more use of MODULE and PLUGIN directive instead of
EXECNOW make command
---
tests/callgraph/function_pointer.i | 11 ++++++-----
tests/dynamic/dynamic.i | 5 ++---
tests/misc/my_visitor.c | 10 ++++++----
tests/slicing/horwitz.i | 4 ++--
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/tests/callgraph/function_pointer.i b/tests/callgraph/function_pointer.i
index b2828711906..4d2a1df1ad8 100644
--- a/tests/callgraph/function_pointer.i
+++ b/tests/callgraph/function_pointer.i
@@ -1,10 +1,11 @@
/* run.config
COMMENT: Test option -cg-function-pointers
- EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -cg-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -cg-no-services -cg-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -cg-no-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -cg-no-services -cg-no-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
+ MODULE: @PTEST_NAME@
+ PLUGIN: @PTEST_PLUGIN@,eva
+ OPT: -cg-function-pointers
+ OPT: -cg-no-services -cg-function-pointers
+ OPT: -cg-no-function-pointers
+ OPT: -cg-no-services -cg-no-function-pointers
*/
int (*fptr)(int);
diff --git a/tests/dynamic/dynamic.i b/tests/dynamic/dynamic.i
index 2e7d88279ff..c9cccd8e7c2 100644
--- a/tests/dynamic/dynamic.i
+++ b/tests/dynamic/dynamic.i
@@ -1,6 +1,5 @@
/*run.config
- EXECNOW: make tests/dynamic/empty.cmo tests/dynamic/abstract.cmo tests/dynamic/abstract2.cmo
- CMD: FRAMAC_PLUGIN=tests/dynamic bin/toplevel.byte
OPT: -add-path tests/dynamic/file_path -add-path tests/dynamic/directory_path -add-path tests/dynamic/none
- OPT: -load-module tests/dynamic/empty.cmo,tests/dynamic/abstract.cmo,tests/dynamic/abstract2.cmo
+ MODULE: empty abstract abstract2
+ OPT:
*/
diff --git a/tests/misc/my_visitor.c b/tests/misc/my_visitor.c
index 9ce70834706..67f7b93d4e9 100644
--- a/tests/misc/my_visitor.c
+++ b/tests/misc/my_visitor.c
@@ -1,8 +1,10 @@
/* run.config
-EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav FRAMAC_PLUGIN=./lib/plugins @frama-c@ @PTEST_FILE@ -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
-OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -no-my-visitor -print
-OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-autoload-plugins -print
+ PLUGIN:
+ MODULE: @PTEST_NAME@
+ EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav @frama-c@ @PTEST_FILE@ -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
+ OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -no-my-visitor -print
+ MODULE:
+ OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -print
*/
int f() {
int y = 0;
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index d12de9261ad..74125fa8ac3 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -1,9 +1,9 @@
/* run.config
- EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+ MODULE: libSelect @PTEST_NAME@
OPT: @EVA_OPTIONS@ -deps -slicing-level 0 -journal-disable
*/
+
/* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
/* bin/toplevel.opt -deps -pdg-debug -pdg @PTEST_DIR@/@PTEST_NAME@.c */
/* cf aussi @PTEST_DIR@/@PTEST_NAME@.ml */
--
GitLab