Merge pull request #593 from dotty-staging/fix-intellij

Clone scala/scala to ./scala-scala instead of ./scala

Author: DarkDimius

scripts/common

@@ -2,12 +2,12 @@ update() {
   [[ -d $baseDir ]] || mkdir -p $baseDir
   cd $baseDir
 
-  if [ ! -d $baseDir/$2 ]; then git clone "https://github.com/$1/$2.git"; fi
+  if [ ! -d $baseDir/$3 ]; then git clone "https://github.com/$1/$2.git" $3; fi
 
-  cd $2
+  cd $3
 
   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 fetch "https://github.com/$1/$2.git" $4 && git checkout -fq FETCH_HEAD) #|| git checkout -fq $4 # || fallback is for local testing on tag
   git reset --hard
 }
 

scripts/jobs/validate/junit

@@ -4,5 +4,5 @@ baseDir=${WORKSPACE-`pwd`}
 scriptsDir="$baseDir/scripts"
 . $scriptsDir/common
 
-update scala scala
+update scala scala scala-scala
 sbt $sbtArgs update compile test

test/test/ScannerTest.scala

@@ -58,6 +58,6 @@ class ScannerTest extends DottyTest {
 
   @Test
   def scanScala() = {
-    scanDir("./scala/src")
+    scanDir("./scala-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-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-scala/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val buf = parsedTrees map transformer.transform
     val ms2 = (System.nanoTime() - start)/1000000