diff options
| -rw-r--r-- | project/Build.scala | 10 | ||||
| -rwxr-xr-x | scripts/common | 2 | ||||
| -rw-r--r-- | test/dotc/tests.scala | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/project/Build.scala b/project/Build.scala index 473ef2443..9c80fdc11 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -8,7 +8,7 @@ object DottyBuild extends Build { val travisMemLimit = List("-Xmx1g", "-Xss2m") - val TRAVIS_BUILD = "dotty.travis.build" + val JENKINS_BUILD = "dotty.jenkins.build" val agentOptions = List( // "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005" @@ -104,8 +104,8 @@ object DottyBuild extends Build { // System.err.println("BOOTPATH: " + fullpath) val travis_build = // propagate if this is a travis build - if (sys.props.isDefinedAt(TRAVIS_BUILD)) - List(s"-D$TRAVIS_BUILD=${sys.props(TRAVIS_BUILD)}") ::: travisMemLimit + if (sys.props.isDefinedAt(JENKINS_BUILD)) + List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: travisMemLimit else List() @@ -156,8 +156,8 @@ object DottyBuild extends Build { // System.err.println("BOOTPATH: " + fullpath) val travis_build = // propagate if this is a travis build - if (sys.props.isDefinedAt(TRAVIS_BUILD)) - List(s"-D$TRAVIS_BUILD=${sys.props(TRAVIS_BUILD)}") + if (sys.props.isDefinedAt(JENKINS_BUILD)) + List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") else List() val res = agentOptions ::: travis_build ::: fullpath diff --git a/scripts/common b/scripts/common index 4924538f0..a51a60a01 100755 --- a/scripts/common +++ b/scripts/common @@ -14,4 +14,4 @@ update() { export LC_ALL=en_US.UTF-8 -sbtArgs="-Ddotty.travis.build=yes -Dfile.encoding=UTF-8 -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13" +sbtArgs="-Ddotty.jenkins.build=yes -Dfile.encoding=UTF-8 -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13" diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 7aa43c13e..6fefbf664 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -8,6 +8,8 @@ import org.junit.experimental.categories._ class tests extends CompilerTest { + def isRunByJenkins: Boolean = sys.props.isDefinedAt("dotty.jenkins.build") + val noCheckOptions = List( // "-verbose", // "-Ylog:frontend", @@ -20,9 +22,12 @@ class tests extends CompilerTest { implicit val defaultOptions = noCheckOptions ++ List( "-Yno-deep-subtypes", "-Yno-double-bindings", - "-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef", - "-d", defaultOutputDir - ) + "-d", defaultOutputDir) ++ { + if (isRunByJenkins) List("-Ycheck:all") + else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") + } + + val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler") val twice = List("#runs", "2") |