diff --git a/.gitignore b/.gitignore index 02faac48cb75df5675f1c034f877c84c7955ab29..af2c06330a6904baa342564a89894046a61eba24 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 65fac10ea25ce4264d85450cd601cce5f26d2bb1..97072eb0ef542bc2fbf556e26951228d4ddb0eff 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 de3d691fc5c29fd3e414b31bd3c64fb5c950ae8b..0df51cc0a0474424c9bf8a67ae8d8d73b98ed688 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 0000000000000000000000000000000000000000..44d5baf740be36f90a9cc3e0978e5894d6af33a5 --- /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 2e8e35bb8fb0c618b6d8a53de445332a4ae8a35c..0000000000000000000000000000000000000000 --- a/travis/jvmopts +++ /dev/null @@ -1,6 +0,0 @@ --Dfile.encoding=UTF8 --Xms2G --Xmx3G --Xss6M --XX:MaxPermSize=700M --XX:ReservedCodeCacheSize=256M