Merge pull request #591 from dotty-staging/scala-infra

Make dotty use scala-infra for CI.

Author: odersky

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"

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

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"
+

scripts/jobs/validate/scalastyle

@@ -0,0 +1,8 @@
+#!/bin/bash -e
+
+baseDir=${WORKSPACE-`pwd`}
+scriptsDir="$baseDir/scripts"
+. $scriptsDir/common
+
+sbt $sbtArgs scalastyle
+

test/test/ScannerTest.scala

@@ -58,6 +58,6 @@ class ScannerTest extends DottyTest {
 
   @Test
   def scanScala() = {
-    scanDir("../scala/src")
+    scanDir("./scala/src")
   }
 }

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

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