Skip to content

Don't count expected errors towards numberOfErrorsToReport limit #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JonasAlaif merged 8 commits into from
Jun 30, 2022
Merged

Don't count expected errors towards numberOfErrorsToReport limit #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5091f1
Don't count expected errors towards `numberOfErrorsToReport` limit
JonasAlaif Jun 3, 2022
7e5a057
Merge branch 'master' into refute
JonasAlaif Jun 13, 2022
e7d35e5
Update silver
JonasAlaif Jun 15, 2022
5c7ee27
Merge branch 'master' into refute
JonasAlaif Jun 19, 2022
a7ec7be
Enable refute tests
JonasAlaif Jun 19, 2022
96a11c2
Properly reset Verifier
JonasAlaif Jun 30, 2022
49532a3
Update silver
JonasAlaif Jun 30, 2022
629caab
Merge branch 'master' into refute
JonasAlaif Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/rules/SymbolicExecutionRules.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import viper.silver.verifier.{Counterexample, CounterexampleTransformer, Model,

trait SymbolicExecutionRules {
protected def createFailure(ve: VerificationError, v: Verifier, s: State, generateNewModel: Boolean = false): Failure = {
if (s.retryLevel == 0) v.errorsReportedSoFar.incrementAndGet()
if (s.retryLevel == 0 && !ve.isExpected) v.errorsReportedSoFar.incrementAndGet()
var ceTrafo: Option[CounterexampleTransformer] = None
val res = ve match {
case ErrorWrapperWithExampleTransformer(wrapped, trafo) =>
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/verifier/BaseVerifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ abstract class BaseVerifier(val config: Config,
override def reset(): Unit = {
super.reset()
statefulSubcomponents foreach (_.reset())
errorsReportedSoFar.set(0)
counters.clear()
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/SiliconTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ class SiliconTests extends SilSuite {

private val silTestDirectories =
Seq("all",
"quantifiedpermissions", "quantifiedpredicates" ,"quantifiedcombinations",
"wands", "termination",
"quantifiedpermissions", "quantifiedpredicates", "quantifiedcombinations",
"wands", "termination", "refute",
"examples")

val testDirectories: Seq[String] = siliconTestDirectories ++ silTestDirectories
Expand Down
⚡