Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
c313c76a
Commit
c313c76a
authored
4 years ago
by
Patrick Baudin
Browse files
Options
Downloads
Patches
Plain Diff
restore tests/jcdb/oracle from master
parent
a0230830
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tests/jcdb/oracle/jcdb.0.res.oracle
+1
-9
1 addition, 9 deletions
tests/jcdb/oracle/jcdb.0.res.oracle
tests/jcdb/oracle/jcdb.1.res.oracle
+16
-2
16 additions, 2 deletions
tests/jcdb/oracle/jcdb.1.res.oracle
tests/jcdb/oracle/jcdb.2.res.oracle
+3
-3
3 additions, 3 deletions
tests/jcdb/oracle/jcdb.2.res.oracle
with
20 additions
and
14 deletions
tests/jcdb/oracle/jcdb.0.res.oracle
+
1
−
9
View file @
c313c76a
[kernel:pp:compilation-db] Warning:
[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.
found duplicate flags for 'tests/jcdb/jcdb.c', replacing old flags.
Old flags no longer present: -DFLAG_TO_BE_FORGOTTEN
Old flags no longer present: -DFLAG_TO_BE_FORGOTTEN
>>>>>>> origin/master
New flags not previously present: -DDUPLICATE_FLAGS_THAT_WILL_BE_OVERWRITTEN
New flags not previously present: -DDUPLICATE_FLAGS_THAT_WILL_BE_OVERWRITTEN
(warn-once: no further messages from category 'pp:compilation-db' will be emitted)
(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 */
/* Generated by Frama-C */
#include "errno.h"
#include "errno.h"
#include "stdarg.h"
#include "stdarg.h"
...
...
This diff is collapsed.
Click to expand it.
tests/jcdb/oracle/jcdb.1.res.oracle
+
16
−
2
View file @
c313c76a
[kernel] User Error: source file 'jcdb2.c' does not exist
[kernel] Parsing tests/jcdb/jcdb.c (with preprocessing)
[kernel] Frama-C aborted: invalid user input.
[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;
}
This diff is collapsed.
Click to expand it.
tests/jcdb/oracle/jcdb.2.res.oracle
+
3
−
3
View file @
c313c76a
[kernel] Parsing jcdb.c (with preprocessing)
[kernel] Parsing
tests/jcdb/
jcdb.c (with preprocessing)
[kernel] Value of -json-compilation-database in default is with_arguments.json
[kernel] Value of -json-compilation-database in default is
tests/jcdb/
with_arguments.json
[kernel] Value of -json-compilation-database in copy is with_arguments.json
[kernel] Value of -json-compilation-database in copy is
tests/jcdb/
with_arguments.json
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment