From 9c3f37cf4a5aa0d7e38037b3040eaa1af813ee4a Mon Sep 17 00:00:00 2001
From: Ian O Connell <ianoc@stripe.com>
Date: Thu, 28 Jul 2016 15:30:46 -0700
Subject: [PATCH 1/3] Update test rules

---
 test_run.sh | 53 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/test_run.sh b/test_run.sh
index 27340ebca..1b4a9e9e6 100755
--- a/test_run.sh
+++ b/test_run.sh
@@ -57,18 +57,41 @@ test_repl() {
   echo "import scala.test._; ScalaLibBinary.main(Array())" | bazel-bin/test/ScalaLibBinaryRepl | grep "A hui hou"
 }
 
-bazel build test/... \
-  && bazel run test:ScalaBinary \
-  && bazel run test:ScalaLibBinary \
-  && bazel run test:JavaBinary \
-  && bazel run test:JavaBinary2 \
-  && bazel run test:MixJavaScalaLibBinary \
-  && bazel run test/src/main/scala/scala/test/twitter_scrooge:justscrooges \
-  && bazel test test/... \
-  && find -L ./bazel-testlogs -iname "*.xml" \
-  && (find -L ./bazel-testlogs -iname "*.xml" | xargs -n1 xmllint > /dev/null) \
-  && test_disappearing_class \
-  && test_build_is_identical \
-  && test_transitive_deps \
-  && test_repl \
-  && echo "all good"
+NC='\033[0m'
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+
+function run_test() {
+  set +e
+  TEST_ARG=$@
+  echo "running test $TEST_ARG"
+  RES=$($TEST_ARG 2>&1)
+  RESPONSE_CODE=$?
+  if [ $RESPONSE_CODE -eq 0 ]; then
+    echo -e "${GREEN} Test $TEST_ARG successful $NC"
+  else
+    echo $RES
+    echo -e "${RED} Test $TEST_ARG failed $NC"
+    exit $RESPONSE_CODE
+  fi
+}
+
+xmllint_test() {
+  find -L ./bazel-testlogs -iname "*.xml" | xargs -n1 xmllint > /dev/null
+}
+run_test bazel build test/...
+run_test bazel test test/...
+run_test bazel run test/src/main/scala/scala/test/twitter_scrooge:justscrooges
+run_test bazel run test:JavaBinary
+run_test bazel run test:JavaBinary2
+run_test bazel run test:MixJavaScalaLibBinary
+run_test bazel run test:ScalaBinary
+run_test bazel run test:ScalaLibBinary
+run_test test_disappearing_class
+run_test find -L ./bazel-testlogs -iname "*.xml"
+run_test xmllint_test
+run_test test_disappearing_class
+run_test test_build_is_identical
+run_test test_transitive_deps
+run_test test_repl
+

From f82800b9324626b8239213a68b85a5e48b222a88 Mon Sep 17 00:00:00 2001
From: Ian O Connell <ianoc@stripe.com>
Date: Thu, 28 Jul 2016 15:32:14 -0700
Subject: [PATCH 2/3] Fix repl test

---
 test_run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_run.sh b/test_run.sh
index 1b4a9e9e6..d61a98391 100755
--- a/test_run.sh
+++ b/test_run.sh
@@ -52,7 +52,7 @@ test_transitive_deps() {
 }
 
 test_repl() {
-  echo "import scala.test._; HelloLib.printMessage(\"foo\")" | bazel-bin/test/HelloLibRepl | grep "foo scala" &&
+  echo "import scala.test._; HelloLib.printMessage(\"foo\")" | bazel-bin/test/HelloLibRepl | grep "foo java" &&
   echo "import scala.test._; TestUtil.foo" | bazel-bin/test/HelloLibTestRepl | grep "bar" &&
   echo "import scala.test._; ScalaLibBinary.main(Array())" | bazel-bin/test/ScalaLibBinaryRepl | grep "A hui hou"
 }

From d3823aa31735bc8d1a33f9ffac4a1ed98841fee0 Mon Sep 17 00:00:00 2001
From: Ian O Connell <ianoc@stripe.com>
Date: Tue, 9 Aug 2016 11:40:40 -0700
Subject: [PATCH 3/3] Use bind's for twitter scrooge so local repo's can
 override scrooge versions

---
 twitter_scrooge/twitter_scrooge.bzl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/twitter_scrooge/twitter_scrooge.bzl b/twitter_scrooge/twitter_scrooge.bzl
index 2b8b47795..2ced1a8d3 100644
--- a/twitter_scrooge/twitter_scrooge.bzl
+++ b/twitter_scrooge/twitter_scrooge.bzl
@@ -18,6 +18,9 @@ def twitter_scrooge():
     sha1 = "2203b4df04943f4d52c53b9608cef60c08786ef2",
     server = "twitter_scrooge_maven_server",
   )
+
+  native.bind(name = 'io_bazel_rules_scala/dependency/thrift/libthrift', actual = '@libthrift//jar')
+
   native.maven_jar(
     name = "scrooge_core",
     artifact = scala_mvn_artifact("com.twitter:scrooge-core:4.6.0"),
@@ -25,6 +28,8 @@ def twitter_scrooge():
     server = "twitter_scrooge_maven_server",
   )
 
+  native.bind(name = 'io_bazel_rules_scala/dependency/thrift/scrooge_core', actual = '@scrooge_core//jar')
+
   #scrooge-generator related dependencies
   native.maven_jar(
     name = "scrooge_generator",
@@ -223,12 +228,12 @@ def scrooge_scala_library(name, deps=[], remote_jars=[], jvm_flags=[], visibilit
         name = name,
         deps = deps + remote_jars + [
             srcjar,
-            "@libthrift//jar",
-            "@scrooge_core//jar"
+            "//external:io_bazel_rules_scala/dependency/thrift/libthrift",
+            "//external:io_bazel_rules_scala/dependency/thrift/scrooge_core"
         ],
         exports = deps + remote_jars + [
-            "@libthrift//jar",
-            "@scrooge_core//jar",
+            "//external:io_bazel_rules_scala/dependency/thrift/libthrift",
+            "//external:io_bazel_rules_scala/dependency/thrift/scrooge_core",
         ],
         jvm_flags = jvm_flags,
         visibility = visibility,