Repository: spark Updated Branches: refs/heads/master 2f254dacf -> 6c1b981c3
[SPARK-4058] [PySpark] Log file name is hard coded even though there is a variable '$LOG_FILE ' In a script 'python/run-tests', log file name is represented by a variable 'LOG_FILE' and it is used in run-tests. But, there are some hard-coded log file name in the script. Author: Kousuke Saruta <saru...@oss.nttdata.co.jp> Closes #2905 from sarutak/SPARK-4058 and squashes the following commits: 7710490 [Kousuke Saruta] Fixed python/run-tests not to use hard-coded log file name Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6c1b981c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6c1b981c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6c1b981c Branch: refs/heads/master Commit: 6c1b981c3fad671bff4795f061bd40e111956621 Parents: 2f254da Author: Kousuke Saruta <saru...@oss.nttdata.co.jp> Authored: Tue Oct 28 12:58:25 2014 -0700 Committer: Andrew Or <and...@databricks.com> Committed: Tue Oct 28 12:58:25 2014 -0700 ---------------------------------------------------------------------- python/run-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6c1b981c/python/run-tests ---------------------------------------------------------------------- diff --git a/python/run-tests b/python/run-tests index 80acd00..a4f0cac 100755 --- a/python/run-tests +++ b/python/run-tests @@ -41,7 +41,7 @@ function run_test() { # Fail and exit on the first test failure. if [[ $FAILED != 0 ]]; then - cat unit-tests.log | grep -v "^[0-9][0-9]*" # filter all lines starting with a number. + cat $LOG_FILE | grep -v "^[0-9][0-9]*" # filter all lines starting with a number. echo -en "\033[31m" # Red echo "Had test failures; see logs." echo -en "\033[0m" # No color @@ -87,7 +87,7 @@ function run_streaming_tests() { run_test "pyspark/streaming/tests.py" } -echo "Running PySpark tests. Output is in python/unit-tests.log." +echo "Running PySpark tests. Output is in python/$LOG_FILE." export PYSPARK_PYTHON="python" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org