diff --git a/scripts/common b/scripts/common new file mode 100755 index 000000000000..1c7be04f286a --- /dev/null +++ b/scripts/common @@ -0,0 +1,14 @@ +update() { + [[ -d $baseDir ]] || mkdir -p $baseDir + cd $baseDir + + if [ ! -d $baseDir/$2 ]; then git clone "https://github.com/$1/$2.git"; fi + + cd $2 + + git fetch --tags "https://github.com/$1/$2.git" + (git fetch "https://github.com/$1/$2.git" $3 && git checkout -fq FETCH_HEAD) #|| git checkout -fq $3 # || fallback is for local testing on tag + git reset --hard +} + +sbtArgs="-Ddotty.travis.build=yes -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13" diff --git a/scripts/jobs/validate/junit b/scripts/jobs/validate/junit new file mode 100755 index 000000000000..9748c3f5fc39 --- /dev/null +++ b/scripts/jobs/validate/junit @@ -0,0 +1,8 @@ +#!/bin/bash -e + +baseDir=${WORKSPACE-`pwd`} +scriptsDir="$baseDir/scripts" +. $scriptsDir/common + +update scala scala +sbt $sbtArgs update compile test diff --git a/scripts/jobs/validate/partest b/scripts/jobs/validate/partest new file mode 100755 index 000000000000..9c3c6254d2b7 --- /dev/null +++ b/scripts/jobs/validate/partest @@ -0,0 +1,8 @@ +#!/bin/bash -e + +baseDir=${WORKSPACE-`pwd`} +scriptsDir="$baseDir/scripts" +. $scriptsDir/common + +sbt $sbtArgs update compile "partest run" + diff --git a/scripts/jobs/validate/scalastyle b/scripts/jobs/validate/scalastyle new file mode 100755 index 000000000000..31ace83bae0c --- /dev/null +++ b/scripts/jobs/validate/scalastyle @@ -0,0 +1,8 @@ +#!/bin/bash -e + +baseDir=${WORKSPACE-`pwd`} +scriptsDir="$baseDir/scripts" +. $scriptsDir/common + +sbt $sbtArgs scalastyle + diff --git a/test/test/ScannerTest.scala b/test/test/ScannerTest.scala index 15ae41c1c6ed..38835e4a0f53 100644 --- a/test/test/ScannerTest.scala +++ b/test/test/ScannerTest.scala @@ -58,6 +58,6 @@ class ScannerTest extends DottyTest { @Test def scanScala() = { - scanDir("../scala/src") + scanDir("./scala/src") } } diff --git a/test/test/desugarPackage.scala b/test/test/desugarPackage.scala index d38669e7b950..b93dcb3e4afa 100644 --- a/test/test/desugarPackage.scala +++ b/test/test/desugarPackage.scala @@ -11,7 +11,7 @@ object desugarPackage extends DeSugarTest { val start = System.nanoTime() val startNodes = Trees.ntrees parseDir("./src") - parseDir("../scala/src") + parseDir("./scala/src") val ms1 = (System.nanoTime() - start)/1000000 val nodes = Trees.ntrees val buf = parsedTrees map desugarTree diff --git a/test/test/parsePackage.scala b/test/test/parsePackage.scala index ceebadd0db04..0bbf1e9c3b88 100644 --- a/test/test/parsePackage.scala +++ b/test/test/parsePackage.scala @@ -66,7 +66,7 @@ object parsePackage extends ParserTest { nodes = 0 val start = System.nanoTime() parseDir("./src") - parseDir("../scala/src") + parseDir("./scala/src") val ms1 = (System.nanoTime() - start)/1000000 val buf = parsedTrees map transformer.transform val ms2 = (System.nanoTime() - start)/1000000 diff --git a/tests/run/byNameVarargs/i499.scala b/tests/pending/run/byNameVarargs/i499.scala similarity index 100% rename from tests/run/byNameVarargs/i499.scala rename to tests/pending/run/byNameVarargs/i499.scala