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
933a4319
Commit
933a4319
authored
6 years ago
by
Virgile Prevosto
Browse files
Options
Downloads
Patches
Plain Diff
[ptests] Allows arobases in options of ptests.
Juste use `@@` as in `Format`
parent
7ca00ea0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ptests/ptests.ml
+13
-9
13 additions, 9 deletions
ptests/ptests.ml
tests/rte/twofunc3.c
+1
-1
1 addition, 1 deletion
tests/rte/twofunc3.c
with
14 additions
and
10 deletions
ptests/ptests.ml
+
13
−
9
View file @
933a4319
...
@@ -493,7 +493,7 @@ end = struct
...
@@ -493,7 +493,7 @@ end = struct
end
end
let
macro_regex
=
Str
.
regexp
"
\\
([^@]*
\\
)@
\\
([^@]
+
\\
)@
\\
(.*
\\
)"
let
macro_regex
=
Str
.
regexp
"
\\
([^@]*
\\
)@
\\
([^@]
*
\\
)@
\\
(.*
\\
)"
type
execnow
=
type
execnow
=
{
{
...
@@ -585,15 +585,19 @@ let replace_macros macros s =
...
@@ -585,15 +585,19 @@ let replace_macros macros s =
let
rest
=
Str
.
matched_group
3
s
in
let
rest
=
Str
.
matched_group
3
s
in
let
new_n
=
Str
.
group_end
1
in
let
new_n
=
Str
.
group_end
1
in
let
n
,
new_s
=
let
n
,
new_s
=
try
if
macro
=
""
then
begin
if
!
verbosity
>=
2
then
lock_printf
"macro is %s
\n
%!"
macro
;
new_n
+
1
,
String
.
sub
s
0
new_n
^
"@"
^
rest
let
replacement
=
StringMap
.
find
macro
macros
in
end
else
begin
if
!
verbosity
>=
1
then
try
lock_printf
"replacement for %s is %s
\n
%!"
macro
replacement
;
if
!
verbosity
>=
2
then
lock_printf
"macro is %s
\n
%!"
macro
;
new_n
,
let
replacement
=
StringMap
.
find
macro
macros
in
String
.
sub
s
0
n
^
start
^
replacement
^
rest
if
!
verbosity
>=
1
then
with
lock_printf
"replacement for %s is %s
\n
%!"
macro
replacement
;
new_n
,
String
.
sub
s
0
n
^
start
^
replacement
^
rest
with
|
Not_found
->
Str
.
group_end
2
+
1
,
s
|
Not_found
->
Str
.
group_end
2
+
1
,
s
end
in
in
if
!
verbosity
>=
2
then
lock_printf
"new string is %s
\n
%!"
new_s
;
if
!
verbosity
>=
2
then
lock_printf
"new string is %s
\n
%!"
new_s
;
let
new_acc
=
ptest_file_matched
,
new_s
in
let
new_acc
=
ptest_file_matched
,
new_s
in
...
...
This diff is collapsed.
Click to expand it.
tests/rte/twofunc3.c
+
1
−
1
View file @
933a4319
/* run.config
/* run.config
EXECNOW: make -s @PTEST_DIR@/rte_api/rte_get_annot.cmxs
EXECNOW: make -s @PTEST_DIR@/rte_api/rte_get_annot.cmxs
OPT: -load-module @PTEST_DIR@/rte_api/rte_get_annot -journal-disable
OPT:
-rte-select @@all
-load-module @PTEST_DIR@/rte_api/rte_get_annot -journal-disable
*/
*/
...
...
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