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
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
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
Charles Southerland
frama-c
Commits
1e009cb5
Commit
1e009cb5
authored
4 years ago
by
Virgile Prevosto
Browse files
Options
Downloads
Patches
Plain Diff
[ptests] ensure exec log comparison are done in the relevant directory
parent
fda985af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ptests/ptests.ml
+11
-2
11 additions, 2 deletions
ptests/ptests.ml
with
11 additions
and
2 deletions
ptests/ptests.ml
+
11
−
2
View file @
1e009cb5
...
...
@@ -1568,6 +1568,13 @@ let default_config () =
end
else
default_config
()
(* if we have some references to directories in the default config, they
need to be adapted to the actual test directory. *)
let
update_dir_ref
dir
config
=
let
update_execnow
e
=
{
e
with
ex_dir
=
dir
}
in
let
dc_execnow
=
List
.
map
update_execnow
config
.
dc_execnow
in
{
config
with
dc_execnow
}
let
()
=
(* enqueue the test files *)
let
default_suites
()
=
...
...
@@ -1612,13 +1619,15 @@ let () =
suite
)
in
let
config
=
SubDir
.
make_file
directory
dir_config_file
in
let
default
=
default_config
()
in
let
default
=
update_dir_ref
directory
default
in
let
dir_config
=
if
Sys
.
file_exists
config
then
begin
let
scan_buffer
=
Scanf
.
Scanning
.
from_file
config
in
scan_options
directory
scan_buffer
(
default
_config
()
)
scan_options
directory
scan_buffer
default
end
else
default
_config
()
else
default
in
if
interpret_as_file
then
begin
...
...
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