From acc08244c86d4841fc1e7d1d6bb1df37b78e60e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Wed, 30 Sep 2020 18:55:13 +0200
Subject: [PATCH] [tests] add jcdb
---
Makefile | 2 +-
tests/jcdb/jcdb.c | 4 ++--
tests/jcdb/oracle/list_files.res | 22 +++-------------------
3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index ae4a8fd2bd1..da2148f462a 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ force-reconfigure:
##############################################################################
.PHONY: tests clean-tests
-TESTS=builtins callgraph cil constant_propagation float idct impact libc metrics misc occurrence pdg rte rte_manual scope slicing sparecode syntax test value
+TESTS=builtins callgraph cil constant_propagation float idct impact libc metrics misc occurrence pdg rte rte_manual scope slicing sparecode syntax test value jcdb
tests: config.sed
find tests -name dune | grep -e "oracle.*/\|result.*/" | xargs --no-run-if-empty rm
dune exec -- ptests/ptests.exe
diff --git a/tests/jcdb/jcdb.c b/tests/jcdb/jcdb.c
index 832434d3bfc..8434093fbb6 100644
--- a/tests/jcdb/jcdb.c
+++ b/tests/jcdb/jcdb.c
@@ -1,10 +1,10 @@
/* run.config
-DEPS: jcdb2.c with_arguments.json compile_commands.json
+DEPS: jcdb2.c with_arguments.json compile_commands.json file_without_main.c
CMXS: @PTEST_NAME@
OPT: -json-compilation-database ./ -print
OPT: jcdb2.c -json-compilation-database with_arguments.json -print
OPT: -json-compilation-database with_arguments.json -load-module %{dep:@PTEST_NAME@.cmxs}
-EXECNOW: LOG list_files.res LOG list_files.err %{read:../syntax/framac_share_path}/analysis-scripts/list_files.py %{dep:compile_commands_working.json} > list_files.res 2> list_files.err
+EXECNOW: LOG list_files.res LOG list_files.err %{read:../../syntax/framac_share_path}/analysis-scripts/list_files.py %{dep:compile_commands_working.json} > list_files.res 2> list_files.err
*/
#include <stdio.h>
diff --git a/tests/jcdb/oracle/list_files.res b/tests/jcdb/oracle/list_files.res
index 5c17aadf10b..088904d79e3 100644
--- a/tests/jcdb/oracle/list_files.res
+++ b/tests/jcdb/oracle/list_files.res
@@ -1,24 +1,8 @@
# Paths as seen by a makefile inside subdirectory '.frama-c':
SRCS=\
-<<<<<<< HEAD
-file_without_main.c \
-jcdb.c \
-||||||| 362083a770
-tests/jcdb/file_without_main.c \
-tests/jcdb/jcdb.c \
-=======
-../tests/jcdb/file_without_main.c \
-../tests/jcdb/jcdb.c \
->>>>>>> origin/master
+../file_without_main.c \
+../jcdb.c \
-<<<<<<< HEAD
-# Possible definition of main function in the following file(s):
-jcdb.c
-||||||| 362083a770
-# Possible definition of main function in the following file(s):
-tests/jcdb/jcdb.c
-=======
# Possible definition of main function in the following file(s), as seen from '.frama-c':
-../tests/jcdb/jcdb.c
->>>>>>> origin/master
+../jcdb.c
--
GitLab