diff options
| author | Kazuaki Ishizaki <ishizaki@jp.ibm.com> | 2015-12-24 21:27:55 +0900 |
|---|---|---|
| committer | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2015-12-24 21:27:55 +0900 |
| commit | 9e85bb71ad2d7d3a9da0cb8853f3216d37e6ff47 (patch) | |
| tree | 0d1bc1e14706b5a72f784f27178eb79d07c2ce6a /dev/run-tests.py | |
| parent | ead6abf7e7fc14b451214951d4991d497aa65e63 (diff) | |
| download | spark-9e85bb71ad2d7d3a9da0cb8853f3216d37e6ff47.tar.gz spark-9e85bb71ad2d7d3a9da0cb8853f3216d37e6ff47.tar.bz2 spark-9e85bb71ad2d7d3a9da0cb8853f3216d37e6ff47.zip | |
[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 <ishizaki@jp.ibm.com>
Closes #10463 from kiszk/SPARK-12502.
Diffstat (limited to 'dev/run-tests.py')
| -rwxr-xr-x | dev/run-tests.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dev/run-tests.py b/dev/run-tests.py index 17ceba052b..6129f87cf8 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 |