Skip to content

Commit

Permalink
HOTFIX for broken CI, by SPARK-1336
Browse files Browse the repository at this point in the history
  • Loading branch information
ScrapCodes committed Apr 4, 2014
1 parent 33e6361 commit 97379d8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ work
.*\.q
golden
test.out/*
.*iml
9 changes: 4 additions & 5 deletions dev/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ rm -rf ./work

# Fail fast
set -e

set -o pipefail
if test -x "$JAVA_HOME/bin/java"; then
declare java_cmd="$JAVA_HOME/bin/java"
else
declare java_cmd=java
fi

FAILED=0
JAVA_VERSION=$($java_cmd -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
[ "$JAVA_VERSION" -ge 18 ] && echo "" || echo "[Warn] Java 8 tests will not run because JDK version is < 1.8."

Expand All @@ -49,7 +49,7 @@ dev/scalastyle
echo "========================================================================="
echo "Running Spark unit tests"
echo "========================================================================="
sbt/sbt assembly test
echo -e "q\n" | sbt/sbt assembly test | grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"

echo "========================================================================="
echo "Running PySpark tests"
Expand All @@ -63,5 +63,4 @@ echo "========================================================================="
echo "Detecting binary incompatibilites with MiMa"
echo "========================================================================="
./bin/spark-class org.apache.spark.tools.GenerateMIMAIgnore
sbt/sbt mima-report-binary-issues | grep -v -e "info.*Resolving"

echo -e "q\n" | sbt/sbt mima-report-binary-issues | grep -v -e "info.*Resolving"
4 changes: 2 additions & 2 deletions dev/scalastyle
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
# limitations under the License.
#

sbt/sbt clean scalastyle > scalastyle.txt
ERRORS=$(cat scalastyle.txt | grep -e "error file")
echo -e "q\n" | sbt/sbt clean scalastyle > scalastyle.txt
ERRORS=$(cat scalastyle.txt | grep -e "error")
if test ! -z "$ERRORS"; then
echo -e "Scalastyle checks failed at following occurrences:\n$ERRORS"
exit 1
Expand Down

0 comments on commit 97379d8

Please sign in to comment.