From ee62f1909f37f42f186d073d1aa7e227161f7afa Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Tue, 5 Apr 2016 15:20:44 +0200
Subject: [PATCH] Depend on version of scala-smtlib with force-destroy
---
build.sbt | 6 ++++--
.../leon/regression/termination/TerminationSuite.scala | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build.sbt b/build.sbt
index ca2702c1d..ccace2591 100644
--- a/build.sbt
+++ b/build.sbt
@@ -44,8 +44,8 @@ libraryDependencies ++= Seq(
"info.hupel" %% "libisabelle-setup" % libisabelleVer,
"info.hupel" %% "slf4j-impl-helper" % "0.1",
"org.ow2.asm" % "asm-all" % "5.0.4",
- "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.6.0-rc2",
- "com.regblanc" %% "scala-smtlib" % "0.2"
+ "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.6.0-rc2"//,
+ //"com.regblanc" %% "scala-smtlib" % "0.2"
)
lazy val scriptName = "leon"
@@ -170,10 +170,12 @@ parallelExecution in GenCTest := false
def ghProject(repo: String, version: String) = RootProject(uri(s"${repo}#${version}"))
lazy val bonsai = ghProject("git://github.com/colder/bonsai.git", "10eaaee4ea0ff6567f4f866922cb871bae2da0ac")
+lazy val scalaSmtlib = ghProject("git://github.com/regb/scala-smtlib.git", "f3c5c174ff30c18e171f919ccc300d590e7762a0")
lazy val root = (project in file(".")).
configs(RegressionTest, IsabelleTest, GenCTest, IntegrTest).
dependsOn(bonsai).
+ dependsOn(scalaSmtlib).
settings(inConfig(RegressionTest)(Defaults.testTasks ++ testSettings): _*).
settings(inConfig(IntegrTest)(Defaults.testTasks ++ testSettings): _*).
settings(inConfig(IsabelleTest)(Defaults.testTasks ++ testSettings): _*).
diff --git a/src/test/scala/leon/regression/termination/TerminationSuite.scala b/src/test/scala/leon/regression/termination/TerminationSuite.scala
index 47eae872e..ae8e6725a 100644
--- a/src/test/scala/leon/regression/termination/TerminationSuite.scala
+++ b/src/test/scala/leon/regression/termination/TerminationSuite.scala
@@ -33,8 +33,8 @@ class TerminationSuite extends LeonRegressionSuite {
}
val ignored = List(
- "termination/valid/NNF.scala",
- "verification/purescala/valid/MergeSort.scala",
+ //"termination/valid/NNF.scala",
+ //"verification/purescala/valid/MergeSort.scala",
"verification/purescala/valid/Nested14.scala"
)
--
GitLab