diff options
| author | shane-huang <shengsheng.huang@intel.com> | 2013-09-27 09:28:33 +0800 |
|---|---|---|
| committer | shane-huang <shengsheng.huang@intel.com> | 2013-09-27 09:28:33 +0800 |
| commit | 84849baf88d31cfaaeee158a947c4db1abe94ce6 (patch) | |
| tree | 364ffa6e77f252264e1ecaf9e517ff387920b8ab /python | |
| parent | 714fdabd99bbff3a0cdec5dcf06b021a3a3f2da8 (diff) | |
| parent | 3a5aa920fc9839aa99ea1befc467cc1f60230f3d (diff) | |
| download | spark-84849baf88d31cfaaeee158a947c4db1abe94ce6.tar.gz spark-84849baf88d31cfaaeee158a947c4db1abe94ce6.tar.bz2 spark-84849baf88d31cfaaeee158a947c4db1abe94ce6.zip | |
Merge branch 'reorgscripts' into scripts-reorg
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/java_gateway.py | 2 | ||||
| -rwxr-xr-x | python/run-tests | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py index e615c1e9b6..b872ae61d5 100644 --- a/python/pyspark/java_gateway.py +++ b/python/pyspark/java_gateway.py @@ -31,7 +31,7 @@ def launch_gateway(): # Launch the Py4j gateway using Spark's run command so that we pick up the # proper classpath and SPARK_MEM settings from spark-env.sh on_windows = platform.system() == "Windows" - script = "spark-class.cmd" if on_windows else "spark-class" + script = "./sbin/spark-class.cmd" if on_windows else "./sbin/spark-class" command = [os.path.join(SPARK_HOME, script), "py4j.GatewayServer", "--die-on-broken-pipe", "0"] if not on_windows: diff --git a/python/run-tests b/python/run-tests index cbc554ea9d..8a08ae3df9 100755 --- a/python/run-tests +++ b/python/run-tests @@ -29,7 +29,7 @@ FAILED=0 rm -f unit-tests.log function run_test() { - $FWDIR/pyspark $1 2>&1 | tee -a unit-tests.log + $FWDIR/bin/pyspark $1 2>&1 | tee -a unit-tests.log FAILED=$((PIPESTATUS[0]||$FAILED)) } |