From 38db166a6318a81a084bee4144991882ec0e9ec2 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Thu, 1 Oct 2020 16:28:00 +0200
Subject: [PATCH] adds src/plugins/server/tests
---
Makefile | 2 +-
src/plugins/server/.gitignore | 4 ++--
.../server/tests/batch/oracle/ast_services.res.oracle | 6 +++---
.../server/tests/batch/oracle/kernel_services.res.oracle | 6 +++---
src/plugins/server/tests/batch/oracle/wrong.res.oracle | 6 +++---
src/plugins/server/tests/batch/test_config | 3 ++-
src/plugins/server/tests/ptests_config | 1 +
7 files changed, 15 insertions(+), 13 deletions(-)
create mode 100644 src/plugins/server/tests/ptests_config
diff --git a/Makefile b/Makefile
index bda2ec1ecd4..82a1d2dade5 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,7 @@ force-reconfigure:
TESTS=builtins callgraph cil constant_propagation float idct impact jcdb journal libc metrics misc occurrence pdg rte rte_manual scope slicing sparecode spec syntax test value
-PLUGIN_TESTS= dive loop_analysis markdown-report nonterm
+PLUGIN_TESTS= dive loop_analysis markdown-report nonterm server
tests: config.sed
find tests $(addprefix src/plugins/,$(addsuffix /tests,$(PLUGIN_TESTS))) -name dune | grep -e "oracle.*/\|result.*/" | xargs --no-run-if-empty rm
diff --git a/src/plugins/server/.gitignore b/src/plugins/server/.gitignore
index b0b245fa88d..2da34c702bc 100644
--- a/src/plugins/server/.gitignore
+++ b/src/plugins/server/.gitignore
@@ -1,3 +1,3 @@
/Makefile
-/tests/ptests_config
-/tests/report/result
+/tests/*/result
+/tests/**/dune
diff --git a/src/plugins/server/tests/batch/oracle/ast_services.res.oracle b/src/plugins/server/tests/batch/oracle/ast_services.res.oracle
index a8f90aa0a6d..15b0b57e6a7 100644
--- a/src/plugins/server/tests/batch/oracle/ast_services.res.oracle
+++ b/src/plugins/server/tests/batch/oracle/ast_services.res.oracle
@@ -1,11 +1,11 @@
-[kernel] Parsing tests/batch/ast_services.i (no preprocessing)
-[server] Script "tests/batch/ast_services.json"
+[kernel] Parsing ast_services.i (no preprocessing)
+[server] Script "ast_services.json"
[server] [GET] kernel.ast.fetchFunctions
[server] [GET] kernel.ast.fetchFunctions
[server] [GET] kernel.ast.printFunction
[server] [GET] kernel.ast.printFunction
[server] [GET] kernel.ast.printFunction
[server] User Error: [kernel.ast.printFunction] Undefined function 'h'
-[server] Output "tests/batch/result/ast_services.out.json"
+[server] Output "./ast_services.out.json"
[server] User Error: Deferred error message was emitted during execution. See above messages for more information.
[kernel] Plug-in server aborted: invalid user input.
diff --git a/src/plugins/server/tests/batch/oracle/kernel_services.res.oracle b/src/plugins/server/tests/batch/oracle/kernel_services.res.oracle
index ac2abc09970..cfe7aa03c23 100644
--- a/src/plugins/server/tests/batch/oracle/kernel_services.res.oracle
+++ b/src/plugins/server/tests/batch/oracle/kernel_services.res.oracle
@@ -1,5 +1,5 @@
-[kernel] Parsing tests/batch/kernel_services.i (no preprocessing)
-[server] Script "tests/batch/kernel_services.json"
+[kernel] Parsing kernel_services.i (no preprocessing)
+[server] Script "kernel_services.json"
[server] [GET] kernel.services.getLogs
[server] [SET] kernel.services.setLogs
-[server] Output "tests/batch/result/kernel_services.out.json"
+[server] Output "./kernel_services.out.json"
diff --git a/src/plugins/server/tests/batch/oracle/wrong.res.oracle b/src/plugins/server/tests/batch/oracle/wrong.res.oracle
index 76ac96361f0..c583023e7fc 100644
--- a/src/plugins/server/tests/batch/oracle/wrong.res.oracle
+++ b/src/plugins/server/tests/batch/oracle/wrong.res.oracle
@@ -1,9 +1,9 @@
-[kernel] Parsing tests/batch/wrong.i (no preprocessing)
-[server] Script "tests/batch/wrong.json"
+[kernel] Parsing wrong.i (no preprocessing)
+[server] Script "wrong.json"
[server] User Error: [batch] "unknown request": request "kernel.unknown" not found
[server] [GET] kernel.ast.printFunction
[server] User Error: [kernel.ast.printFunction] Expected string, got object:
{ "f1": 1, "f2": { "x": 1, "y": 2 }, "f3": null }
-[server] Output "tests/batch/result/wrong.out.json"
+[server] Output "./wrong.out.json"
[server] User Error: Deferred error message was emitted during execution. See above messages for more information.
[kernel] Plug-in server aborted: invalid user input.
diff --git a/src/plugins/server/tests/batch/test_config b/src/plugins/server/tests/batch/test_config
index 15a16cd4f95..dcc28f9c11b 100644
--- a/src/plugins/server/tests/batch/test_config
+++ b/src/plugins/server/tests/batch/test_config
@@ -1,2 +1,3 @@
+PLUGIN: server
LOG: @PTEST_NAME@.out.json
-OPT: -no-autoload-plugins -load-module server -check -server-batch @PTEST_DIR@/@PTEST_NAME@.json -server-batch-output-dir @PTEST_RESULT@
+OPT: -check -server-batch %{dep:@PTEST_NAME@.json} -server-batch-output-dir .
diff --git a/src/plugins/server/tests/ptests_config b/src/plugins/server/tests/ptests_config
new file mode 100644
index 00000000000..588227adac2
--- /dev/null
+++ b/src/plugins/server/tests/ptests_config
@@ -0,0 +1 @@
+DEFAULT_SUITES= batch
--
GitLab