commit 5163f53730f5f49fc5c8007d1653eecb9720be82
author Brian Muramatsu <btmura@google.com> Mon Oct 31 11:07:23 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 31 11:07:23 2011 -0700
tree aec0250be024b6dfcf8f8125e0853acce1861b23
parent 0558876f5ad7f422b7261027dd3174dd64bf6b97
parent a275ecc2b87c73acbb5a68a6c15585005f136a3b

Merge "Set CTS Version to 4.0_r1" into ics-mr0

tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
index 2524281..f53507d 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -15,7 +15,6 @@
  */
 package com.android.cts.tradefed.build;
 
-import com.android.tradefed.build.BuildRetrievalError;
 import com.android.tradefed.build.FolderBuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.build.IBuildProvider;
@@ -32,12 +31,13 @@
     @Option(name="cts-install-path", description="the path to the cts installation to use")
     private String mCtsRootDirPath = System.getProperty("CTS_ROOT");
 
-    public static final String CTS_BUILD_VERSION = "ICS_tradefed";
+    public static final String CTS_BUILD_VERSION = "4.0_r1";
 
     /**
      * {@inheritDoc}
      */
-    public IBuildInfo getBuild() throws BuildRetrievalError {
+    @Override
+    public IBuildInfo getBuild() {
         if (mCtsRootDirPath == null) {
             throw new IllegalArgumentException("Missing --cts-install-path");
         }
@@ -49,6 +49,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void buildNotTested(IBuildInfo info) {
         // ignore
     }
@@ -56,6 +57,7 @@
     /**
      * {@inheritDoc}
      */
+    @Override
     public void cleanUp(IBuildInfo info) {
         // ignore
     }

tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java

diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java b/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
index 38effaa..72451f1 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/command/CtsConsole.java
@@ -49,6 +49,12 @@
         super();
     }
 
+    @Override
+    public void run() {
+        printLine(String.format("Android CTS %s", CtsBuildProvider.CTS_BUILD_VERSION));
+        super.run();
+    }
+
     /**
      * Adds the 'list packages' and 'list plans' commands
      */
@@ -116,9 +122,6 @@
                 ADD_PATTERN));
     }
 
-    /**
-     * @return
-     */
     @Override
     protected String getConsolePrompt() {
         return "cts-tf > ";