Build and run APK tests.

build/android/buildbot_functions.sh

 #!/bin/bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 205 matching lines @@
 }
 
 # Compile step
 function bb_compile {
   # This must be named 'compile', not 'Compile', for CQ interaction.
   # Talk to maruel for details.
   echo "@@@BUILD_STEP compile@@@"
   bb_goma_make
 }
 
-# Re-gyp and compile with unit test bundles configured as shlibs for
-# the native test runner.  Experimental for now.  Once the native test
-# loader is on by default, this entire function becomes obsolete.
-function bb_compile_apk_tests {
-  echo "@@@BUILD_STEP Re-gyp for the native test runner@@@"
-  # Setup goma again. Not doing this breaks the android_gyp step.
-  bb_setup_goma_internal
-
-  GYP_DEFINES="$GYP_DEFINES gtest_target_type=shared_library" android_gyp
-
-  echo "@@@BUILD_STEP Native test runner compile@@@"
-  bb_goma_make
-}
-
 # Experimental compile step; does not turn the tree red if it fails.
 function bb_compile_experimental {
   # Linking DumpRenderTree appears to hang forever?
   EXPERIMENTAL_TARGETS="android_experimental"
   for target in ${EXPERIMENTAL_TARGETS} ; do
     echo "@@@BUILD_STEP Experimental Compile $target @@@"
     set +e
     bb_goma_make -k "${target}"
     if [ $? -ne 0 ] ; then
       echo "@@@STEP_WARNINGS@@@"
     fi
     set -e
   done
 }
 
 # Run tests on an emulator.
 function bb_run_tests_emulator {
   echo "@@@BUILD_STEP Run Tests on an Emulator@@@"
   build/android/run_tests.py -e --xvfb --verbose
 }
 
 # Run tests on an actual device.  (Better have one plugged in!)
 function bb_run_tests {
   echo "@@@BUILD_STEP Run Tests on actual hardware@@@"
-  build/android/run_tests.py --xvfb --verbose
-}
-
-# Run APK tests on an actual device.
-function bb_run_apk_tests {
-  echo "@@@BUILD_STEP Run APK Tests on actual hardware@@@"
   build/android/run_tests.py --xvfb --verbose --apk=True
 }
 
 # Zip and archive a build.
 function bb_zip_build {
   echo "@@@BUILD_STEP Zip build@@@"
   python ../../../../scripts/slave/zip_build.py \
     --src-dir "$SRC_ROOT" \
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
 }
 
 # Download and extract a build.
 function bb_extract_build {
   echo "@@@BUILD_STEP Download and extract build@@@"
   if [[ -z $FACTORY_PROPERTIES || -z $BUILD_PROPERTIES ]]; then
     return 1
   fi
 
   python ../../../../scripts/slave/extract_build.py \
     --build-dir "$SRC_ROOT" \
     --build-output-dir "out" \
     --target Release \
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
 }