From d63babd7254911ccf413b8a04b75a8401d913fae Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Fri, 29 Oct 2021 15:08:01 +0200
Subject: [PATCH] [tests] removing remaining load-module

---
 tests/builtins/test_config_bitwise  | 6 ++++--
 tests/builtins/test_config_equality | 6 ++++--
 tests/builtins/test_config_gauges   | 6 ++++--
 tests/builtins/test_config_octagon  | 6 ++++--
 tests/builtins/test_config_symblocs | 6 ++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/tests/builtins/test_config_bitwise b/tests/builtins/test_config_bitwise
index 365fdc8d48c..7129d40503e 100644
--- a/tests/builtins/test_config_bitwise
+++ b/tests/builtins/test_config_bitwise
@@ -1,3 +1,5 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_equality b/tests/builtins/test_config_equality
index 365fdc8d48c..7129d40503e 100644
--- a/tests/builtins/test_config_equality
+++ b/tests/builtins/test_config_equality
@@ -1,3 +1,5 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_gauges b/tests/builtins/test_config_gauges
index 365fdc8d48c..7129d40503e 100644
--- a/tests/builtins/test_config_gauges
+++ b/tests/builtins/test_config_gauges
@@ -1,3 +1,5 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_octagon b/tests/builtins/test_config_octagon
index 365fdc8d48c..7129d40503e 100644
--- a/tests/builtins/test_config_octagon
+++ b/tests/builtins/test_config_octagon
@@ -1,3 +1,5 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+OPT: @EVA_TEST@
diff --git a/tests/builtins/test_config_symblocs b/tests/builtins/test_config_symblocs
index 365fdc8d48c..7129d40503e 100644
--- a/tests/builtins/test_config_symblocs
+++ b/tests/builtins/test_config_symblocs
@@ -1,3 +1,5 @@
 MACRO: EVA_OPTIONS @EVA_OPTIONS@ -eva-msg-key malloc -eva-warn-key malloc:weak=feedback -eva-no-alloc-returns-null
-MACRO: EVA_CONFIG @EVA_OPTIONS@ -no-autoload-plugins -load-module from,inout,eva,scope,variadic -machdep x86_32
-OPT: -eva @EVA_CONFIG@ -journal-disable -out -input -deps
+MACRO: EVA_CONFIG @EVA_OPTIONS@ -machdep x86_32
+MACRO: EVA_TEST -eva @EVA_CONFIG@ -out -input -deps
+
+OPT: @EVA_TEST@
-- 
GitLab