Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cool
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hans-Peter Deifel
cool
Commits
ce35fe09
Commit
ce35fe09
authored
10 years ago
by
Thorsten Wißmann
Browse files
Options
Downloads
Patches
Plain Diff
Implement testcase skipping to avoid PML crashes
parent
81b749c7
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/testsuite/cool-testsuite.ml
+21
-12
21 additions, 12 deletions
src/testsuite/cool-testsuite.ml
with
21 additions
and
12 deletions
src/testsuite/cool-testsuite.ml
+
21
−
12
View file @
ce35fe09
...
@@ -100,9 +100,9 @@ let kOrKd_testcases : satCheck list =
...
@@ -100,9 +100,9 @@ let kOrKd_testcases : satCheck list =
let
pml_testcases
:
testcase_section
=
let
pml_testcases
:
testcase_section
=
use_functor
"PML"
use_functor
"PML"
[
sat
"{>= 1/3} C & {< 1/2} D"
[
sat
"
SKIP
{>= 1/3} C & {< 1/2} D"
;
sat
"{>= 1/3} C & {< 1/2} C"
;
sat
"
SKIP
{>= 1/3} C & {< 1/2} C"
;
unsat
"{< 1/3} C & {>= 1/2} C"
;
unsat
"
SKIP
{< 1/3} C & {>= 1/2} C"
;
sat
"{< 1/3} C & {< 1/2} C"
;
sat
"{< 1/3} C & {< 1/2} C"
]
]
...
@@ -119,13 +119,15 @@ let testcases =
...
@@ -119,13 +119,15 @@ let testcases =
;
pml_testcases
;
pml_testcases
;
use_functor
"PML + K"
;
use_functor
"PML + K"
[
sat
"(P4 + False)"
[
sat
"(P4 + False)"
;
sat
"(({>= 3/5} p0 & {>= 2/5} p1) + False)"
;
sat
"
SKIP
(({>= 3/5} p0 & {>= 2/5} p1) + False)"
;
sat
"({>= 3/5} (False + <R1> True & <R2> True) & {>= 2/5} ({>= 1/10} p0 & {>= 1/10} (~ p0) + False ) + False)"
;
sat
"
SKIP
({>= 3/5} (False + <R1> True & <R2> True) & {>= 2/5} ({>= 1/10} p0 & {>= 1/10} (~ p0) + False ) + False)"
]
]
]
]
let
main
=
let
main
=
let
skipchecker
=
Str
.
regexp
"SKIP "
in
(* skip formulas beginning with "SKIP " *)
let
success
=
ref
0
in
let
success
=
ref
0
in
let
skipped
=
ref
0
in
let
failed
=
ref
0
in
let
failed
=
ref
0
in
foreach_l
testcases
(
fun
(
name
,
table
)
->
foreach_l
testcases
(
fun
(
name
,
table
)
->
Printf
.
printf
"==== Testing %s ====
\n
"
name
;
Printf
.
printf
"==== Testing %s ====
\n
"
name
;
...
@@ -134,19 +136,26 @@ let main =
...
@@ -134,19 +136,26 @@ let main =
Printf.printf "sortTable = %s\n" (FP.stringFromSortTable sorts);
Printf.printf "sortTable = %s\n" (FP.stringFromSortTable sorts);
*)
*)
foreach_l
table
(
fun
sc
->
foreach_l
table
(
fun
sc
->
let
(
expected
,_,_
)
=
sc
in
let
(
expected
,
sort
,
formula
)
=
sc
in
let
actual
=
runSatCheckVerbose
sc
in
if
Str
.
string_match
skipchecker
formula
0
(* compare the expected and the actual result *)
then
begin
if
actual
=
expected
print_endline
(
"Skipping formula »"
^
formula
^
"«"
);
then
success
:=
!
success
+
1
skipped
:=
!
skipped
+
1
else
failed
:=
!
failed
+
1
end
else
begin
let
actual
=
runSatCheckVerbose
sc
in
(* compare the expected and the actual result *)
if
actual
=
expected
then
success
:=
!
success
+
1
else
failed
:=
!
failed
+
1
end
);
);
print_endline
""
print_endline
""
);
);
let
s
n
=
if
n
=
1
then
"testcase"
else
"testcases"
in
let
s
n
=
if
n
=
1
then
"testcase"
else
"testcases"
in
Printf
.
printf
"=> %d %s succeeded, %d %s failed.
\n
"
Printf
.
printf
"=> %d %s succeeded, %d %s failed
, %d skipped
.
\n
"
!
success
(
s
!
success
)
!
success
(
s
!
success
)
!
failed
(
s
!
failed
)
!
failed
(
s
!
failed
)
!
skipped
let
_
=
main
let
_
=
main
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