From bfe9a251083879bdccd8d093e26e2bb3a9ebc387 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <ekneuss@gmail.com>
Date: Thu, 16 Apr 2015 17:48:09 +0200
Subject: [PATCH] Try to fetch cvc4 before running sbt test so we test cvc4 as
well
---
.gitignore | 2 ++
.travis.yml | 5 +++--
build.sbt | 2 +-
travis/fetchCVC4.sh | 5 +++++
travis/jvmopts | 6 ------
5 files changed, 11 insertions(+), 9 deletions(-)
create mode 100755 travis/fetchCVC4.sh
delete mode 100644 travis/jvmopts
diff --git a/.gitignore b/.gitignore
index 02faac48c..af2c06330 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ testingSheet.sc
#z3
.z3-trace
+
+travis/builds
diff --git a/.travis.yml b/.travis.yml
index 65fac10ea..97072eb0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,10 @@ notifications:
- regwblanc@gmail.com
irc: "chat.freenode.net#epfl-lara"
-before_script:
+before_script:
- sbt compile
- sbt script
+ - source travis/fetchCVC4.sh
script:
- - sbt -jvm-opts travis/jvmopts test
+ - sbt test
diff --git a/build.sbt b/build.sbt
index de3d691fc..0df51cc0a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -35,7 +35,7 @@ Keys.fork in Test := true
logBuffered in Test := false
-javaOptions in Test ++= Seq("-Xss32M", "-Xmx4G", "-XX:MaxPermSize=128M")
+javaOptions in Test ++= Seq("-Xss16M", "-Xmx4G", "-XX:MaxPermSize=128M")
parallelExecution in Test := false
diff --git a/travis/fetchCVC4.sh b/travis/fetchCVC4.sh
new file mode 100755
index 000000000..44d5baf74
--- /dev/null
+++ b/travis/fetchCVC4.sh
@@ -0,0 +1,5 @@
+d=`date +%Y-%m-%d --date="2 days ago"`
+dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
+mkdir -p $dir/builds
+curl http://cvc4.cs.nyu.edu/builds/x86_64-linux-opt/unstable/cvc4-$d-x86_64-linux-opt -o $dir/builds/cvc4
+export PATH=$dir/builds/:$PATH
diff --git a/travis/jvmopts b/travis/jvmopts
deleted file mode 100644
index 2e8e35bb8..000000000
--- a/travis/jvmopts
+++ /dev/null
@@ -1,6 +0,0 @@
--Dfile.encoding=UTF8
--Xms2G
--Xmx3G
--Xss6M
--XX:MaxPermSize=700M
--XX:ReservedCodeCacheSize=256M
--
GitLab