From 5b35e1b60c7e7635df4ea6636316a8ecc0e2b6ba Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Mon, 30 Mar 2015 17:12:23 +0200
Subject: [PATCH] Slight test improvements
---
.../scala/leon/test/verification/NewSolversRegression.scala | 2 +-
.../leon/test/verification/VerificationRegression.scala | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/test/scala/leon/test/verification/NewSolversRegression.scala b/src/test/scala/leon/test/verification/NewSolversRegression.scala
index e88290002..9013002f8 100644
--- a/src/test/scala/leon/test/verification/NewSolversRegression.scala
+++ b/src/test/scala/leon/test/verification/NewSolversRegression.scala
@@ -32,7 +32,7 @@ class NewSolversRegression extends VerificationRegression {
(
if (isZ3Available)
- List(List("--solvers=smt-z3-quantified", "--feelinglucky"))
+ List(List("--solvers=smt-z3-quantified", "--feelinglucky", "--timeout=3"))
else Nil
) ++ (
if (isCVC4Available)
diff --git a/src/test/scala/leon/test/verification/VerificationRegression.scala b/src/test/scala/leon/test/verification/VerificationRegression.scala
index 2cd355a66..36f578b13 100644
--- a/src/test/scala/leon/test/verification/VerificationRegression.scala
+++ b/src/test/scala/leon/test/verification/VerificationRegression.scala
@@ -10,9 +10,6 @@ import leon.purescala.Definitions.Program
import leon.frontends.scalac.ExtractionPhase
import leon.utils.PreprocessingPhase
-import _root_.smtlib.interpreters._
-
-import java.io.File
// If you add another regression test, make sure it contains one object whose name matches the file name
// This is because we compile all tests from each folder separately.
@@ -51,7 +48,7 @@ trait VerificationRegression extends LeonTestSuite {
}
}
- private[verification] def forEachFileIn(cat : String, forError: Boolean = false)(block : Output=>Unit) {
+ private[verification] def forEachFileIn(cat : String)(block : Output=>Unit) {
val fs = filesInResourceDir( testDir + cat, _.endsWith(".scala")).toList
fs foreach { file =>
--
GitLab