From 4569e126be9970f812d725733b0ea678b4077383 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 28 Sep 2016 20:49:45 -0400 Subject: set circle back to java7 to make sure cbt works there and disable dotty tests for java7, but run them otherwise, e.g. locally --- test/test.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/test.scala b/test/test.scala index ca64d99..bb7e89a 100644 --- a/test/test.scala +++ b/test/test.scala @@ -193,9 +193,13 @@ object Main{ compile("../examples/scalajs-react-example/js") compile("../examples/scalajs-react-example/jvm") compile("../examples/multi-project-example") - compile("../examples/dotty-example") - task("run","../examples/dotty-example") - task("doc","../examples/dotty-example") + if(sys.props("java.version").startsWith("1.7")){ + System.err.println("\nskipping dotty tests on Java 7") + } else { + compile("../examples/dotty-example") + task("run","../examples/dotty-example") + task("doc","../examples/dotty-example") + } task("fastOptJS","../examples/scalajs-react-example/js") task("fullOptJS","../examples/scalajs-react-example/js") compile("../examples/uber-jar-example") -- cgit v1.2.3