From 0599c190a63298e10ccd2a5ea28bb7e0b8a89090 Mon Sep 17 00:00:00 2001
From: Nicolas Voirol <voirol.nicolas@gmail.com>
Date: Fri, 11 Nov 2016 17:11:16 +0100
Subject: [PATCH] Make configurations inheritable
---
src/it/scala/inox/TestSuite.scala | 2 +-
src/it/scala/inox/solvers/SolvingTestSuite.scala | 2 +-
src/it/scala/inox/solvers/unrolling/BagSuite.scala | 2 +-
src/it/scala/inox/solvers/unrolling/QuantifiersSuite.scala | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/it/scala/inox/TestSuite.scala b/src/it/scala/inox/TestSuite.scala
index a227ad00e..58c65220e 100644
--- a/src/it/scala/inox/TestSuite.scala
+++ b/src/it/scala/inox/TestSuite.scala
@@ -9,7 +9,7 @@ import utils._
trait TestSuite extends FunSuite with Matchers with Timeouts {
- val configurations: Seq[Seq[OptionValue[_]]] = Seq(Seq.empty)
+ def configurations: Seq[Seq[OptionValue[_]]] = Seq(Seq.empty)
private val counter = new UniqueCounter[Unit]
counter.nextGlobal // Start at 1
diff --git a/src/it/scala/inox/solvers/SolvingTestSuite.scala b/src/it/scala/inox/solvers/SolvingTestSuite.scala
index 2fe9c90e3..b2271a488 100644
--- a/src/it/scala/inox/solvers/SolvingTestSuite.scala
+++ b/src/it/scala/inox/solvers/SolvingTestSuite.scala
@@ -5,7 +5,7 @@ package solvers
trait SolvingTestSuite extends TestSuite {
- override val configurations = for {
+ override def configurations = for {
solverName <- Seq("nativez3", "unrollz3", "smt-z3", "smt-cvc4")
checkModels <- Seq(false, true)
feelingLucky <- Seq(false, true)
diff --git a/src/it/scala/inox/solvers/unrolling/BagSuite.scala b/src/it/scala/inox/solvers/unrolling/BagSuite.scala
index 77db57dbb..af74660a5 100644
--- a/src/it/scala/inox/solvers/unrolling/BagSuite.scala
+++ b/src/it/scala/inox/solvers/unrolling/BagSuite.scala
@@ -8,7 +8,7 @@ class BagSuite extends SolvingTestSuite with DatastructureUtils {
import trees._
import dsl._
- override val configurations = for {
+ override def configurations = for {
solverName <- Seq("nativez3", "unrollz3", "smt-z3", "smt-cvc4")
feelingLucky <- Seq(false, true)
} yield Seq(
diff --git a/src/it/scala/inox/solvers/unrolling/QuantifiersSuite.scala b/src/it/scala/inox/solvers/unrolling/QuantifiersSuite.scala
index b8f15db74..f3c200122 100644
--- a/src/it/scala/inox/solvers/unrolling/QuantifiersSuite.scala
+++ b/src/it/scala/inox/solvers/unrolling/QuantifiersSuite.scala
@@ -8,7 +8,7 @@ class QuantifiersSuite extends TestSuite {
import inox.trees._
import dsl._
- override val configurations = List(
+ override def configurations = List(
("nativez3", false, false, false),
("smt-z3", false, false, false),
("smt-cvc4", false, false, false),
--
GitLab