From b2c5feef38f09a749753f390f353d0c6e36cbef7 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <ekneuss@gmail.com>
Date: Fri, 24 Jul 2015 02:22:20 +0200
Subject: [PATCH] Fix test options
---
build.sbt | 6 ++++--
src/test/scala/leon/test/codegen/CodeGenSuite.scala | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build.sbt b/build.sbt
index 4b8234b84..bcbcc7ee0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -102,9 +102,11 @@ testFrameworks += new TestFramework("org.scalameter.ScalaMeterFramework")
parallelExecution in Test := false
-testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument(TestFrameworks.ScalaCheck, "-oDF"))
+parallelExecution in (Test, testOnly) := false
-testOptions in (Test, testOnly) := Seq(Tests.Argument(TestFrameworks.ScalaCheck, "-oDF"))
+testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument(TestFrameworks.ScalaTest, "-oDF"))
+
+testOptions in (Test, testOnly) := Seq(Tests.Argument(TestFrameworks.ScalaTest, "-oDF"))
sourcesInBase in Compile := false
diff --git a/src/test/scala/leon/test/codegen/CodeGenSuite.scala b/src/test/scala/leon/test/codegen/CodeGenSuite.scala
index a33d868be..f58cc604b 100644
--- a/src/test/scala/leon/test/codegen/CodeGenSuite.scala
+++ b/src/test/scala/leon/test/codegen/CodeGenSuite.scala
@@ -272,7 +272,7 @@ class CodeGenSuite extends test.LeonTestSuite {
case class Conc() extends Ab { }
def test = { val willNotLoop = Conc(); 42 }
}
- object list {
+ object ListWithSize {
abstract class List[T] {
val length : Int = this match {
case Nil() => 0
--
GitLab