From 4dc6bb788e9b33c94f3d248f225092399a1267be Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 22 Sep 2019 19:04:03 -0400 Subject: [PATCH] check that Linux output doesn't contain any junk --- .travis.yml | 2 +- citest/build.sbt | 7 ------- citest/test.sh | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a655dd166..b26654512 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ scala: 2.10.7 env: global: - - SBT_VER=1.3.0-M4 + - SBT_VER=1.3.0 - TRAVIS_JDK=adopt@1.8.212-04 - JABBA_HOME=$HOME/.jabba - TRAVIS_JDK11=openjdk@1.11.0 diff --git a/citest/build.sbt b/citest/build.sbt index 19f66a715..567f42ae1 100644 --- a/citest/build.sbt +++ b/citest/build.sbt @@ -18,12 +18,5 @@ lazy val root = (project in file(".")) val ys = IO.readLines(file("err.txt")).toVector.distinct assert(ys.isEmpty, s"there's an stderr: $ys") - }, - - check2 := { - val xs = IO.readLines(file("output.txt")).toVector - println(xs) - val ys = IO.readLines(file("err.txt")).toVector.distinct - assert(!ys.exists(_.contains("Ignoring option MaxPermSize; support was removed in 8.0")), s"there's an stderr: $ys") } ) diff --git a/citest/test.sh b/citest/test.sh index 2dc2870b9..3cac58991 100755 --- a/citest/test.sh +++ b/citest/test.sh @@ -15,7 +15,7 @@ unzip -qo ../target/universal/sbt.zip -d ./freshly-baked ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about ./freshly-baked/sbt/bin/sbt -Dsbt.no.format=true about 1> output.txt 2> err.txt -./freshly-baked/sbt/bin/sbt check2 +./freshly-baked/sbt/bin/sbt check ./freshly-baked/sbt/bin/sbt about run -v