From c313c76a594937f24d50d276e29029faf85c5f41 Mon Sep 17 00:00:00 2001
From: Patrick Baudin <patrick.baudin@cea.fr>
Date: Wed, 30 Sep 2020 16:22:17 +0200
Subject: [PATCH] restore tests/jcdb/oracle from master
---
tests/jcdb/oracle/jcdb.0.res.oracle | 10 +---------
tests/jcdb/oracle/jcdb.1.res.oracle | 18 ++++++++++++++++--
tests/jcdb/oracle/jcdb.2.res.oracle | 6 +++---
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/tests/jcdb/oracle/jcdb.0.res.oracle b/tests/jcdb/oracle/jcdb.0.res.oracle
index c0f9c80895e..aca498a1f02 100644
--- a/tests/jcdb/oracle/jcdb.0.res.oracle
+++ b/tests/jcdb/oracle/jcdb.0.res.oracle
@@ -1,17 +1,9 @@
[kernel:pp:compilation-db] Warning:
-<<<<<<< HEAD
- found duplicate flags for 'jcdb.c', replacing old flags.
- Old flags no longer present: -D'MSG="a \" \"b"' -D'SINGLE_DOUBLE(a)="a \"with spaces and tab "' -DSOMEDEF="With spaces, quotes and \-es." -D"DOUBLE_SINGLE(a)=a \"macro with spaces and non-escaped \\'\"" -DEMPTY='' -DEMPTY2= -DTEST=42 -D'MACRO_FOR_INCR(s)=s+1' -DTOUNDEF -UTOUNDEF
-||||||| 362083a770
- found duplicate flags for 'tests/jcdb/jcdb.c', replacing old flags.
- Old flags no longer present: -D'MSG="a \" \"b"' -D'SINGLE_DOUBLE(a)="a \"with spaces and tab "' -DSOMEDEF="With spaces, quotes and \-es." -D"DOUBLE_SINGLE(a)=a \"macro with spaces and non-escaped \\'\"" -DEMPTY='' -DEMPTY2= -DTEST=42 -D'MACRO_FOR_INCR(s)=s+1' -DTOUNDEF -UTOUNDEF
-=======
found duplicate flags for 'tests/jcdb/jcdb.c', replacing old flags.
Old flags no longer present: -DFLAG_TO_BE_FORGOTTEN
->>>>>>> origin/master
New flags not previously present: -DDUPLICATE_FLAGS_THAT_WILL_BE_OVERWRITTEN
(warn-once: no further messages from category 'pp:compilation-db' will be emitted)
-[kernel] Parsing jcdb.c (with preprocessing)
+[kernel] Parsing tests/jcdb/jcdb.c (with preprocessing)
/* Generated by Frama-C */
#include "errno.h"
#include "stdarg.h"
diff --git a/tests/jcdb/oracle/jcdb.1.res.oracle b/tests/jcdb/oracle/jcdb.1.res.oracle
index 0d82a066ec8..3fbf07641f3 100644
--- a/tests/jcdb/oracle/jcdb.1.res.oracle
+++ b/tests/jcdb/oracle/jcdb.1.res.oracle
@@ -1,2 +1,16 @@
-[kernel] User Error: source file 'jcdb2.c' does not exist
-[kernel] Frama-C aborted: invalid user input.
+[kernel] Parsing tests/jcdb/jcdb.c (with preprocessing)
+[kernel] Parsing tests/jcdb/jcdb2.c (with preprocessing)
+/* Generated by Frama-C */
+#include "errno.h"
+#include "stdarg.h"
+#include "stddef.h"
+#include "stdio.h"
+int main(void)
+{
+ int __retres;
+ char *s = (char *)"a macro with spaces and non-escaped \'";
+ __retres = 42 + 1;
+ return __retres;
+}
+
+
diff --git a/tests/jcdb/oracle/jcdb.2.res.oracle b/tests/jcdb/oracle/jcdb.2.res.oracle
index ff04c79f131..10b73dfc7a6 100644
--- a/tests/jcdb/oracle/jcdb.2.res.oracle
+++ b/tests/jcdb/oracle/jcdb.2.res.oracle
@@ -1,3 +1,3 @@
-[kernel] Parsing jcdb.c (with preprocessing)
-[kernel] Value of -json-compilation-database in default is with_arguments.json
-[kernel] Value of -json-compilation-database in copy is with_arguments.json
+[kernel] Parsing tests/jcdb/jcdb.c (with preprocessing)
+[kernel] Value of -json-compilation-database in default is tests/jcdb/with_arguments.json
+[kernel] Value of -json-compilation-database in copy is tests/jcdb/with_arguments.json
--
GitLab