From a45d65fb3db9a48de7d6d7644045d3caee04111e Mon Sep 17 00:00:00 2001 From: Patrick Baudin <patrick.baudin@cea.fr> Date: Tue, 5 Oct 2021 17:00:29 +0200 Subject: [PATCH] [Tests] uses MODULE and PLUGIN directives instead of EXECNOW make command --- tests/journal/control.i | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/journal/control.i b/tests/journal/control.i index 111deed9894..6a365c6c81a 100644 --- a/tests/journal/control.i +++ b/tests/journal/control.i @@ -1,14 +1,14 @@ /* run.config - COMMENT: do not compare generated journals since they depend on current time - EXECNOW: BIN control_journal.ml BIN control_journal_bis.ml (./bin/toplevel.opt -journal-enable -check -eva -deps -out @EVA_OPTIONS@ -main f -journal-name tests/journal/result/control_journal.ml tests/journal/control.i && cp tests/journal/result/control_journal.ml tests/journal/result/control_journal_bis.ml) > @DEV_NULL@ 2> @DEV_NULL@ - CMD: FRAMAC_LIB=lib/fc ./bin/toplevel.byte - OPT: -load-script tests/journal/result/control_journal -journal-disable - CMD: FRAMAC_LIB=lib/fc ./bin/toplevel.byte - OPT: -load-script tests/journal/result/control_journal_bis -calldeps -journal-disable - EXECNOW: make -s @PTEST_DIR@/abstract_cpt.cmxs - EXECNOW: BIN abstract_cpt_journal.ml FRAMAC_LIB=lib/fc ./bin/toplevel.byte -journal-enable -load-module @PTEST_DIR@/abstract_cpt -load-script tests/journal/use_cpt.ml -journal-name tests/journal/result/abstract_cpt_journal.ml > @DEV_NULL@ 2> @DEV_NULL@ - CMD: FRAMAC_LIB=lib/fc ./bin/toplevel.byte - OPT: -load-script tests/journal/result/abstract_cpt_journal.ml -load-module @PTEST_DIR@/abstract_cpt -load-script tests/journal/use_cpt.ml + COMMENT: do not compare generated journals since they depend on current time + PLUGIN: @EVA_PLUGINS@ + EXECNOW: BIN control_journal.ml @frama-c@ @PTEST_FILE@ -journal-enable -eva -deps -out @EVA_OPTIONS@ -main f -journal-name control_journal.ml > @DEV_NULL@ 2> @DEV_NULL@ + OPT: -load-script control_journal.ml + MODULE: + EXECNOW: BIN control_journal_bis.ml cp control_journal.ml control_journal_bis.ml > @DEV_NULL@ 2> @DEV_NULL@ + OPT: -calldeps -load-script control_journal_bis.ml + MODULE: abstract_cpt use_cpt + EXECNOW: BIN abstract_cpt_journal.ml @frama-c@ -journal-enable -journal-name abstract_cpt_journal.ml > @DEV_NULL@ 2> @DEV_NULL@ + OPT: -load-script abstract_cpt_journal.ml */ int x,y,c,d; -- GitLab