From 86cbb275b32a2d456a4a6040fe4e97bb0f91b216 Mon Sep 17 00:00:00 2001
From: Armin <me@obrown.io>
Date: Wed, 15 Nov 2017 10:11:02 +0100
Subject: [PATCH] #8672 adjust gradle to use plain output on CI

Fixes #8678
---
 ci/integration_tests.sh | 8 ++++----
 ci/unit_tests.sh        | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/integration_tests.sh b/ci/integration_tests.sh
index 8503f57ff..5d2c55d9f 100755
--- a/ci/integration_tests.sh
+++ b/ci/integration_tests.sh
@@ -24,10 +24,10 @@ elif [[ $1 == "split" ]]; then
     cd ../..
     if [[ $2 == 0 ]]; then
        echo "Running the first half of integration specs: $specs0"
-       ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$specs0"
+       ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$specs0" --console=plain
     elif [[ $2 == 1 ]]; then
        echo "Running the second half of integration specs: $specs1"
-       ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$specs1"
+       ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$specs1" --console=plain
     else
        echo "Error, must specify 0 or 1 after the split. For example ci/integration_tests.sh split 0"
        exit 1
@@ -35,9 +35,9 @@ elif [[ $1 == "split" ]]; then
 
 elif [[ !  -z  $@  ]]; then
     echo "Running integration tests 'rspec $@'"
-    ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$@"
+    ./gradlew runIntegrationTests -PrubyIntegrationSpecs="$@" --console=plain
 
 else
     echo "Running all integration tests"
-    ./gradlew runIntegrationTests
+    ./gradlew runIntegrationTests --console=plain
 fi
diff --git a/ci/unit_tests.sh b/ci/unit_tests.sh
index d53608a6f..90b1186a0 100755
--- a/ci/unit_tests.sh
+++ b/ci/unit_tests.sh
@@ -19,11 +19,11 @@ if [[ $SELECTED_TEST_SUITE == $"core-fail-fast" ]]; then
   rake test:core-fail-fast
 elif [[ $SELECTED_TEST_SUITE == $"java" ]]; then
   echo "Running Java Tests"
-  ./gradlew javaTests
+  ./gradlew javaTests --console=plain
 elif [[ $SELECTED_TEST_SUITE == $"ruby" ]]; then
   echo "Running Ruby unit tests"
-  ./gradlew rubyTests
+  ./gradlew rubyTests --console=plain
 else
   echo "Running Java and Ruby unit tests"
-  ./gradlew test
+  ./gradlew test --console=plain
 fi