diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /python/run-tests | |
parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
Diffstat (limited to 'python/run-tests')
-rwxr-xr-x | python/run-tests | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/run-tests b/python/run-tests index 4b71fff7c1..feba97cee0 100755 --- a/python/run-tests +++ b/python/run-tests @@ -29,7 +29,7 @@ FAILED=0 rm -f unit-tests.log function run_test() { - SPARK_TESTING=0 $FWDIR/pyspark $1 2>&1 | tee -a unit-tests.log + SPARK_TESTING=0 $FWDIR/bin/pyspark $1 2>&1 | tee -a unit-tests.log FAILED=$((PIPESTATUS[0]||$FAILED)) } |