commit 5ef7bff64da60327f08552c7919bb64f649144fc
author Narayan Kamath <narayan@google.com> Tue Jan 28 09:35:42 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 28 09:35:43 2014 +0000
tree 945f67f68f33437759bbd00e634784b32a4a9a52
parent afe64d7b5f434a54ae6e81ac00d060d8e86397d1
parent 6803425827818b78083ed018b1b4e46a4ece5e02

Merge "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