From ccbbe261b7ba2d41b01ca1df1d4655e07086b088 Mon Sep 17 00:00:00 2001
From: Dmitry Petrashko <dmitry.petrashko@gmail.com>
Date: Thu, 21 May 2015 17:01:43 +0200
Subject: Clone scala/scala to ./scala-scala instead of ./scala

Otherwise Intellij stops running JUnit tests correctly. No idea why.
---
 scripts/common              | 6 +++---
 scripts/jobs/validate/junit | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/common b/scripts/common
index 1c7be04f2..9ebfb8197 100755
--- a/scripts/common
+++ b/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
 }
 
diff --git a/scripts/jobs/validate/junit b/scripts/jobs/validate/junit
index 9748c3f5f..36078c170 100755
--- a/scripts/jobs/validate/junit
+++ b/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
-- 
cgit v1.2.3