fix ci errors

Author: andyscott

.travis.yml

@@ -30,7 +30,7 @@ before_install:
   - |
     if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then
       choco install jdk8 -params 'installdir=c:\\java8'
-      choco install bazel --version 0.28.1
+      choco install bazel --version 0.28.0
     fi
   - cat .bazelrc.travis >> .bazelrc
 

test_reproducibility.sh

@@ -2,8 +2,10 @@
 
 set -e
 
-# ci stopgap: ensure tools/bazel is run for `bazel` invocations
-PATH="$(cd "$(dirname "$0")"/..; pwd)"/tools:$PATH
+if ! bazel_loc="$(type -p 'bazel')" || [[ -z "$bazel_loc" ]]; then
+  export PATH="$(cd "$(dirname "$0")"; pwd)"/tools:$PATH
+  echo 'Using ./tools/bazel directly for bazel calls'
+fi
 
 md5_util() {
     if [[ "$OSTYPE" == "darwin"* ]]; then

test_rules_scala.sh

@@ -2,8 +2,10 @@
 
 set -e
 
-# ci stopgap: ensure tools/bazel is run for `bazel` invocations
-PATH="$(cd "$(dirname "$0")"/..; pwd)"/tools:$PATH
+if ! bazel_loc="$(type -p 'bazel')" || [[ -z "$bazel_loc" ]]; then
+  export PATH="$(cd "$(dirname "$0")"; pwd)"/tools:$PATH
+  echo 'Using ./tools/bazel directly for bazel calls'
+fi
 
 test_disappearing_class() {
   git checkout test_expect_failure/disappearing_class/ClassProvider.scala

test_runner.sh

@@ -12,7 +12,7 @@ run_test_ci() {
   local TEST_ARG=$@
   local log_file=output_$$.log
   echo "running test $TEST_ARG"
-  $TEST_ARG &>$log_file &
+  eval $TEST_ARG &>$log_file &
   local test_pid=$!
   SECONDS=0
   test_pulse_printer $! $TIMOUT $TEST_ARG &
@@ -83,4 +83,4 @@ get_test_runner() {
     exit 1
   fi
   echo "run_test_${test_env}"
-}
+}