[tests] add jcdb

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

tests/jcdb/jcdb.c

 /* 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>
 

tests/jcdb/oracle/list_files.res

 # 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