From 0c06c6ddf99056c36954d02d543b2f7a8ede9053 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Thu, 25 Mar 2021 10:39:01 +0100
Subject: [PATCH] [Tests] using MODULE directive into RTE tests
---
Makefile | 8 ++++----
tests/rte/{compute_annot => }/compute_annot.ml | 0
tests/rte/{my_annot_proxy => }/my_annot_proxy.ml | 0
tests/rte/{my_annotation => }/my_annotation.ml | 0
tests/rte/precond2.c | 4 ++--
tests/rte/{rte_api => }/rte_get_annot.ml | 0
tests/rte/threefunc.c | 4 ++--
tests/rte/twofunc.c | 4 ++--
tests/rte/twofunc3.c | 4 ++--
9 files changed, 12 insertions(+), 12 deletions(-)
rename tests/rte/{compute_annot => }/compute_annot.ml (100%)
rename tests/rte/{my_annot_proxy => }/my_annot_proxy.ml (100%)
rename tests/rte/{my_annotation => }/my_annotation.ml (100%)
rename tests/rte/{rte_api => }/rte_get_annot.ml (100%)
diff --git a/Makefile b/Makefile
index 72ee2dfc2f0..4290dd45385 100644
--- a/Makefile
+++ b/Makefile
@@ -937,10 +937,10 @@ PLUGIN_DISTRIBUTED:=yes
PLUGIN_INTERNAL_TEST:=yes
PLUGIN_TESTS_DIRS:=rte rte_manual
PLUGIN_TESTS_LIB:=\
- tests/rte/my_annotation/my_annotation.ml \
- tests/rte/rte_api/rte_get_annot.ml \
- tests/rte/compute_annot/compute_annot.ml \
- tests/rte/my_annot_proxy/my_annot_proxy.ml
+ tests/rte/my_annotation.ml \
+ tests/rte/rte_get_annot.ml \
+ tests/rte/compute_annot.ml \
+ tests/rte/my_annot_proxy.ml
$(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
#################
diff --git a/tests/rte/compute_annot/compute_annot.ml b/tests/rte/compute_annot.ml
similarity index 100%
rename from tests/rte/compute_annot/compute_annot.ml
rename to tests/rte/compute_annot.ml
diff --git a/tests/rte/my_annot_proxy/my_annot_proxy.ml b/tests/rte/my_annot_proxy.ml
similarity index 100%
rename from tests/rte/my_annot_proxy/my_annot_proxy.ml
rename to tests/rte/my_annot_proxy.ml
diff --git a/tests/rte/my_annotation/my_annotation.ml b/tests/rte/my_annotation.ml
similarity index 100%
rename from tests/rte/my_annotation/my_annotation.ml
rename to tests/rte/my_annotation.ml
diff --git a/tests/rte/precond2.c b/tests/rte/precond2.c
index 72d360e0d96..1998f41545b 100644
--- a/tests/rte/precond2.c
+++ b/tests/rte/precond2.c
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s @PTEST_DIR@/compute_annot/compute_annot.cmxs
- OPT: -warn-special-float none -load-module @PTEST_DIR@/compute_annot/compute_annot -journal-disable
+ MODULE: compute_annot
+ OPT: -warn-special-float none -journal-disable
*/
int global = 15;
diff --git a/tests/rte/rte_api/rte_get_annot.ml b/tests/rte/rte_get_annot.ml
similarity index 100%
rename from tests/rte/rte_api/rte_get_annot.ml
rename to tests/rte/rte_get_annot.ml
diff --git a/tests/rte/threefunc.c b/tests/rte/threefunc.c
index 03b2ad3b373..5f784c64cd0 100644
--- a/tests/rte/threefunc.c
+++ b/tests/rte/threefunc.c
@@ -1,6 +1,6 @@
/* run.config
-EXECNOW: make -s @PTEST_DIR@/my_annotation/my_annotation.cmxs
-OPT: -load-module @PTEST_DIR@/my_annotation/my_annotation
+ MODULE: my_annotation
+ OPT:
*/
diff --git a/tests/rte/twofunc.c b/tests/rte/twofunc.c
index 2732ad9f1f9..353f3f1aa77 100644
--- a/tests/rte/twofunc.c
+++ b/tests/rte/twofunc.c
@@ -1,6 +1,6 @@
/* run.config
-EXECNOW: make -s @PTEST_DIR@/my_annot_proxy/my_annot_proxy.cmxs
-OPT: -load-module @PTEST_DIR@/my_annot_proxy/my_annot_proxy
+ MODULE: my_annot_proxy
+ OPT:
*/
diff --git a/tests/rte/twofunc3.c b/tests/rte/twofunc3.c
index fab3e66a5ab..883964687b8 100644
--- a/tests/rte/twofunc3.c
+++ b/tests/rte/twofunc3.c
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s @PTEST_DIR@/rte_api/rte_get_annot.cmxs
- OPT: -rte-select @@all -load-module @PTEST_DIR@/rte_api/rte_get_annot -journal-disable
+ MODULE: rte_get_annot
+ OPT: -rte-select @@all -journal-disable
*/
--
GitLab