Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
inox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LARA
inox
Commits
c9000256
Commit
c9000256
authored
11 years ago
by
Etienne Kneuss
Browse files
Options
Downloads
Patches
Plain Diff
Relax the way we report slow tests. Enforce types on set operations
parent
11e6dc97
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
src/main/scala/leon/purescala/Trees.scala
+9
-3
9 additions, 3 deletions
src/main/scala/leon/purescala/Trees.scala
src/test/scala/leon/test/LeonTestSuite.scala
+3
-1
3 additions, 1 deletion
src/test/scala/leon/test/LeonTestSuite.scala
with
12 additions
and
4 deletions
src/main/scala/leon/purescala/Trees.scala
+
9
−
3
View file @
c9000256
...
@@ -478,9 +478,15 @@ object Trees {
...
@@ -478,9 +478,15 @@ object Trees {
case
class
SubsetOf
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
with
FixedType
{
case
class
SubsetOf
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
with
FixedType
{
val
fixedType
=
BooleanType
val
fixedType
=
BooleanType
}
}
case
class
SetIntersection
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
case
class
SetIntersection
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
{
case
class
SetUnion
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
leastUpperBound
(
Seq
(
set1
,
set2
).
map
(
_
.
getType
)).
foreach
(
setType
_
)
case
class
SetDifference
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
}
case
class
SetUnion
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
{
leastUpperBound
(
Seq
(
set1
,
set2
).
map
(
_
.
getType
)).
foreach
(
setType
_
)
}
case
class
SetDifference
(
set1
:
Expr
,
set2
:
Expr
)
extends
Expr
{
leastUpperBound
(
Seq
(
set1
,
set2
).
map
(
_
.
getType
)).
foreach
(
setType
_
)
}
case
class
SetMin
(
set
:
Expr
)
extends
Expr
case
class
SetMin
(
set
:
Expr
)
extends
Expr
case
class
SetMax
(
set
:
Expr
)
extends
Expr
case
class
SetMax
(
set
:
Expr
)
extends
Expr
...
...
This diff is collapsed.
Click to expand it.
src/test/scala/leon/test/LeonTestSuite.scala
+
3
−
1
View file @
c9000256
...
@@ -96,8 +96,10 @@ trait LeonTestSuite extends FunSuite with Timeouts {
...
@@ -96,8 +96,10 @@ trait LeonTestSuite extends FunSuite with Timeouts {
}
}
override
def
test
(
name
:
String
,
tags
:
Tag*
)(
body
:
=>
Unit
)
{
override
def
test
(
name
:
String
,
tags
:
Tag*
)(
body
:
=>
Unit
)
{
super
.
test
(
name
,
tags
:
_
*
)
{
super
.
test
(
name
,
tags
:
_
*
)
{
val
id
=
testIdentifier
(
name
)
val
id
=
testIdentifier
(
name
)
val
ts
=
now
()
val
ts
=
now
()
testContext
=
generateContext
testContext
=
generateContext
...
@@ -111,7 +113,7 @@ trait LeonTestSuite extends FunSuite with Timeouts {
...
@@ -111,7 +113,7 @@ trait LeonTestSuite extends FunSuite with Timeouts {
val
stats
=
getStats
(
id
)
val
stats
=
getStats
(
id
)
if
(!
stats
.
accountsFor
(
total
))
{
if
(!
stats
.
accountsFor
(
total
))
{
fail
(
"
Test took too long to run: "
+
total
+
"ms (avg: "
+
stats
.
avg
+
", stddev: "
+
stats
.
stddev
+
")"
)
info
(
Console
.
YELLOW
+
"[warning]
Test took too long to run: "
+
total
+
"ms (avg: "
+
stats
.
avg
+
", stddev: "
+
stats
.
stddev
+
")"
)
}
}
storeStats
(
id
,
stats
.
withValue
(
total
))
storeStats
(
id
,
stats
.
withValue
(
total
))
...
...
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