Cleanup buildbot step names

- unify unittest step names with chromium in preparation for
  CQ / gatekeeper
- Simplify instrumentation test step names for clarity
  and because stats is broken on testers due to symbols in 
  the step names.
 [http://build.chromium.org/p/chromium.fyi/stats/Chromium%20Linux%20Android%20Tester]

BUG=138463

Review URL: https://chromiumcodereview.appspot.com/10910056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154810 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 6 deletions

diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index 32a5532..5db18c2 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -42,7 +42,6 @@ function bb_force_bot_green_and_exit {
 }
 
 function bb_run_gclient_hooks {
-  echo "@@@BUILD_STEP runhooks android@@@"
   gclient runhooks
 }
 
@@ -247,7 +246,6 @@ function bb_run_unit_tests {
   rm -rf "$LOGCAT_DUMP_DIR"
   python build/android/adb_logcat_monitor.py "$LOGCAT_DUMP_DIR" &
 
-  echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose
 
   echo "@@@BUILD_STEP Logcat dump@@@"
@@ -261,9 +259,6 @@ function bb_run_unit_tests {
 function bb_run_instrumentation_test {
   local TEST_APK=${1}
   local EXTRA_FLAGS=${2}
-  local APK_NAME=$(basename ${TEST_APK})
-  echo "@@@BUILD_STEP Android Instrumentation ${APK_NAME} ${EXTRA_FLAGS} "\
-       "on actual hardware@@@"
   local INSTRUMENTATION_FLAGS="-vvv"
   INSTRUMENTATION_FLAGS+=" --test-apk ${TEST_APK}"
   INSTRUMENTATION_FLAGS+=" ${EXTRA_FLAGS}"
diff --git a/build/android/run_instrumentation_tests.py b/build/android/run_instrumentation_tests.py
index 4937123..9e9a280 100755
--- a/build/android/run_instrumentation_tests.py
+++ b/build/android/run_instrumentation_tests.py
@@ -10,6 +10,7 @@ import sys
 import time
 
 from pylib import apk_info
+from pylib import buildbot_report
 from pylib import test_options_parser
 from pylib import run_java_tests
 from pylib import run_python_tests
@@ -70,6 +71,8 @@ def DispatchInstrumentationTests(options):
 def main(argv):
   options = test_options_parser.ParseInstrumentationArgs(argv)
   run_tests_helper.SetLogLevel(options.verbose_count)
+  buildbot_report.PrintNamedStep('Instrumentation tests: %s'
+                                 % ', '.join(options.annotation))
   return DispatchInstrumentationTests(options)
 
 
diff --git a/build/android/run_tests.py b/build/android/run_tests.py
index afb5f0e..95abe1d 100755
--- a/build/android/run_tests.py
+++ b/build/android/run_tests.py
@@ -273,7 +273,7 @@ def _RunATestSuite(options):
     0 if successful, number of failing tests otherwise.
   """
   step_name = os.path.basename(options.test_suite).replace('-debug.apk', '')
-  buildbot_report.PrintNamedStep('Test suite %s' % step_name)
+  buildbot_report.PrintNamedStep(step_name)
   attached_devices = []
   buildbot_emulators = []