commit f9c872bfa001a5ce4db4eeec5d5a20e4332b8632
author Tobias Thierer <tobiast@google.com> Wed May 31 16:30:46 2017 +0100
committer Tobias Thierer <tobiast@google.com> Wed May 31 17:08:57 2017 +0100
tree ae7576ef68f4e32b17488e91e5d27c2719b561a2
parent 93519599314be06b0ed22e4e749bafa5e2cad942

Allow version 9 toolchains for EXPERIMENTAL_USE_OPENJDK9

cts-tradefed contains a similar version number check as java.go
(build/soong commit 849bb6bf99f142039aece3362d8fb4b56aba5c12 in
http://r.android.com/403232 ). This CL changes the check used
in cts-tradefed when EXPERIMENTAL_USE_OPENJDK9 is set to be
consistent with the one used during make.

Bug: 38177295
Bug: 62138512
Test: Checked that cts-tradefed doesn't crash on either
      OpenJDK 8 or OpenJDK 9 toolchains (with/without
      EXPERIMENTAL_USE_OPENJDK9 set).

Change-Id: I66a9efeffa477fc25845917224eb3540c13fe458

tools/cts-tradefed/etc/cts-tradefed

diff --git a/tools/cts-tradefed/etc/cts-tradefed b/tools/cts-tradefed/etc/cts-tradefed
index 00f51af..3edc21f 100755
--- a/tools/cts-tradefed/etc/cts-tradefed
+++ b/tools/cts-tradefed/etc/cts-tradefed
@@ -36,10 +36,18 @@
 checkPath java
 
 # check java version
-JAVA_VERSION=$(java -version 2>&1 | head -n 2 | grep '[ "]1\.[678][\. "$$]')
-if [ "${JAVA_VERSION}" == "" ]; then
-    echo "Wrong java version. 1.6, 1.7 or 1.8 is required."
-    exit
+if [ "${EXPERIMENTAL_USE_OPENJDK9}" == "" ]; then
+    JAVA_VERSION=$(java -version 2>&1 | head -n 2 | grep '[ "]1\.[678][\. "$$]')
+    if [ "${JAVA_VERSION}" == "" ]; then
+        echo "Wrong java version. 1.6, 1.7 or 1.8 is required."
+        exit
+    fi
+else
+    JAVA_VERSION=$(java -version 2>&1 | head -n 2 | grep '^java .* "9.*')
+    if [ "${JAVA_VERSION}" == "" ]; then
+        echo "Wrong java version. Version 9 is required."
+        exit
+    fi
 fi
 
 # check debug flag and set up remote debugging