Specify the test files to be used as an argument to the instrumentation tests

build/android/buildbot/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 297 matching lines @@
   echo "@@@BUILD_STEP Install ${APK}@@@"
   python build/android/adb_install_apk.py --apk ${APK} \
       --apk_package ${APK_PACKAGE} ${BUILDFLAG}
 }
 
 # Run instrumentation tests for a specific APK.
 # Args:
 #   $1: APK to be installed.
 #   $2: APK_PACKAGE for the APK to be installed.
 #   $3: TEST_APK to run the tests against.
+#   $4: TEST_DATA in format destination:source
 function bb_run_all_instrumentation_tests_for_apk {
   local APK=${1}
   local APK_PACKAGE=${2}
   local TEST_APK=${3}
+  local TEST_DATA=${4}
 
   # Install application APK.
   bb_install_apk ${APK} ${APK_PACKAGE}
 
   # Run instrumentation tests. Using -I to install the test apk.
   echo "@@@BUILD_STEP Run instrumentation tests ${TEST_APK}@@@"
   bb_run_step python build/android/run_instrumentation_tests.py \
-      -vvv --test-apk ${TEST_APK} -I
+      -vvv --test-apk ${TEST_APK} -I --test_data ${TEST_DATA}
 }
 
 # Run instrumentation tests for all relevant APKs on device.
 function bb_run_instrumentation_tests {
   bb_run_all_instrumentation_tests_for_apk "ContentShell.apk" \
-      "org.chromium.content_shell" "ContentShellTest"
+      "org.chromium.content_shell" "ContentShellTest" \
+      "content:content/test/data/android/device_files"
   bb_run_all_instrumentation_tests_for_apk "ChromiumTestShell.apk" \
-      "org.chromium.chrome.testshell" "ChromiumTestShellTest"
+      "org.chromium.chrome.testshell" "ChromiumTestShellTest" \
+      "chrome:chrome/test/data/android/device_files"
 }
 
 # Run instrumentation tests for experimental APKs on device.
 function bb_run_experimental_instrumentation_tests {
   bb_run_all_instrumentation_tests_for_apk "AndroidWebView.apk" \
-      "org.chromium.android_webview" "AndroidWebViewTest"
+      "org.chromium.android_webview" "AndroidWebViewTest" \
+      "webview:android_webview/test/data/device_files"
 }
 
 # Zip and archive a build.
 function bb_zip_build {
   echo "@@@BUILD_STEP Zip build@@@"
   python ../../../../scripts/slave/zip_build.py \
     --src-dir "$SRC_ROOT" \
     --exclude-files "lib.target,gen,android_webview,jingle_unittests" \
     --factory-properties "$FACTORY_PROPERTIES" \
     --build-properties "$BUILD_PROPERTIES"
@@ skipping 56 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP', '')"
 }