From cccd3120f671478d908c5426ddd76c1115d22179 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <ekneuss@gmail.com>
Date: Wed, 15 Apr 2015 01:34:20 +0200
Subject: [PATCH] Fix tests
---
build.sbt | 2 +-
src/main/scala/leon/synthesis/rules/CEGISLike.scala | 2 --
src/test/scala/leon/test/evaluators/EvaluatorsTests.scala | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index 14d73203e..d0470fa87 100644
--- a/build.sbt
+++ b/build.sbt
@@ -39,7 +39,7 @@ javaOptions in Test ++= Seq("-Xss32M", "-Xmx4G", "-XX:MaxPermSize=128M")
parallelExecution in Test := false
-testOptions in (Test, run) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument("-oDF"))
+testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument("-oDF"))
testOptions in (Test, testOnly) := Seq(Tests.Argument("-oDF"))
sourcesInBase in Compile := false
diff --git a/src/main/scala/leon/synthesis/rules/CEGISLike.scala b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
index 96c28f234..974509205 100644
--- a/src/main/scala/leon/synthesis/rules/CEGISLike.scala
+++ b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
@@ -840,13 +840,11 @@ abstract class CEGISLike[T <% Typed](name: String) extends Rule(name) {
val cachedInputIterator = new Iterator[Seq[Expr]] {
def next() = {
val i = inputIterator.next()
- println("Found "+i)
baseExampleInputs += i
i
}
def hasNext = {
- println("Has next? "+ inputIterator.hasNext)
inputIterator.hasNext
}
}
diff --git a/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala b/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala
index 635e0c042..f26e633eb 100644
--- a/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala
+++ b/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala
@@ -460,7 +460,7 @@ class EvaluatorsTests extends leon.test.LeonTestSuite {
implicit val prog = parseString(p)
- val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams(maxFunctionInvocations = 32))
+ val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams.default.copy(maxFunctionInvocations = 32))
checkEvaluatorError(e, mkCall("c", IL(42)))
}
@@ -479,7 +479,7 @@ class EvaluatorsTests extends leon.test.LeonTestSuite {
implicit val prog = parseString(p)
- val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams(checkContracts = true))
+ val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams.default)
checkError(e, mkCall("c", IL(-42)))
}
--
GitLab