commit 39143ca2d3e6522030e24951815f782c3dfb41ad
author Narayan Kamath <narayan@google.com> Tue Jan 28 09:51:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 09:51:17 2014 +0000
tree b4ff68c674e66c6195ad057c14a4a8192262729f
parent 7a2d622974382a91c455c628862d6055956eb45c
parent 5a64f9c289c1af345f0d05e07b9ba161eedb7342

am 5a64f9c2: am 5ef7bff6: Merge "Allow cts-tradefed to be run with java7."

* commit '5a64f9c289c1af345f0d05e07b9ba161eedb7342':
  Allow cts-tradefed to be run with java7.

tools/tradefed-host/etc/cts-tradefed

diff --git a/tools/tradefed-host/etc/cts-tradefed b/tools/tradefed-host/etc/cts-tradefed
index 11f97e6..bc5c07a 100755
--- a/tools/tradefed-host/etc/cts-tradefed
+++ b/tools/tradefed-host/etc/cts-tradefed
@@ -35,9 +35,9 @@
 checkPath java
 
 # check java version
-JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]')
+JAVA_VERSION=$(java -version 2>&1 | head -n 1 | grep '[ "]1\.[67][\. "$$]')
 if [ "${JAVA_VERSION}" == "" ]; then
-    echo "Wrong java version. 1.6 is required."
+    echo "Wrong java version. 1.6 or 1.7 is required."
     exit
 fi