You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sa...@apache.org on 2015/12/24 13:28:11 UTC
spark git commit: [SPARK-12502][BUILD][PYTHON] Script /dev/run-tests
fails when IBM Java is used
Repository: spark
Updated Branches:
refs/heads/master ead6abf7e -> 9e85bb71a
[SPARK-12502][BUILD][PYTHON] Script /dev/run-tests fails when IBM Java is used
fix an exception with IBM JDK by removing update field from a JavaVersion tuple. This is because IBM JDK does not have information on update '_xx'
Author: Kazuaki Ishizaki <is...@jp.ibm.com>
Closes #10463 from kiszk/SPARK-12502.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9e85bb71
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9e85bb71
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9e85bb71
Branch: refs/heads/master
Commit: 9e85bb71ad2d7d3a9da0cb8853f3216d37e6ff47
Parents: ead6abf
Author: Kazuaki Ishizaki <is...@jp.ibm.com>
Authored: Thu Dec 24 21:27:55 2015 +0900
Committer: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Committed: Thu Dec 24 21:27:55 2015 +0900
----------------------------------------------------------------------
dev/run-tests.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9e85bb71/dev/run-tests.py
----------------------------------------------------------------------
diff --git a/dev/run-tests.py b/dev/run-tests.py
index 17ceba0..6129f87 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -148,7 +148,7 @@ def determine_java_executable():
return java_exe if java_exe else which("java")
-JavaVersion = namedtuple('JavaVersion', ['major', 'minor', 'patch', 'update'])
+JavaVersion = namedtuple('JavaVersion', ['major', 'minor', 'patch'])
def determine_java_version(java_exe):
@@ -164,14 +164,13 @@ def determine_java_version(java_exe):
# find raw version string, eg 'java version "1.8.0_25"'
raw_version_str = next(x for x in raw_output_lines if " version " in x)
- match = re.search('(\d+)\.(\d+)\.(\d+)_(\d+)', raw_version_str)
+ match = re.search('(\d+)\.(\d+)\.(\d+)', raw_version_str)
major = int(match.group(1))
minor = int(match.group(2))
patch = int(match.group(3))
- update = int(match.group(4))
- return JavaVersion(major, minor, patch, update)
+ return JavaVersion(major, minor, patch)
# -------------------------------------------------------------------------------------------------
# Functions for running the other build and test scripts
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org