summaryrefslogtreecommitdiffstats
path: root/build/android/buildbot
diff options
context:
space:
mode:
authorfrankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 19:29:17 +0000
committerfrankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 19:29:17 +0000
commit8d8ca048e74bf602db741d079d452ef5c7499c2e (patch)
tree695482a60c93e87b6fd19105b2a5cebd3df13b13 /build/android/buildbot
parentc6ab5ed75176e3c637f5eecd5467a148596e5475 (diff)
downloadchromium_src-8d8ca048e74bf602db741d079d452ef5c7499c2e.zip
chromium_src-8d8ca048e74bf602db741d079d452ef5c7499c2e.tar.gz
chromium_src-8d8ca048e74bf602db741d079d452ef5c7499c2e.tar.bz2
[Android] Add a dummy host-driven test for ChromiumTestShell.
Currently, we have no host-driven tests upstream. This dummy test verifies the functionality of the framework. NOTRY=True BUG=168255 Review URL: https://chromiumcodereview.appspot.com/12207171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/buildbot')
-rwxr-xr-xbuild/android/buildbot/bb_device_steps.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 81e540b..3acc4c3 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -36,24 +36,27 @@ CHROME_SRC = constants.CHROME_DIR
# test_apk: apk to run tests on.
# test_data: data folder in format destination:source.
I_TEST = collections.namedtuple('InstrumentationTest', [
- 'name', 'apk', 'apk_package', 'test_apk', 'test_data'])
+ 'name', 'apk', 'apk_package', 'test_apk', 'test_data', 'host_driven_root'])
INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
I_TEST('ContentShell',
'ContentShell.apk',
'org.chromium.content_shell_apk',
'ContentShellTest',
- 'content:content/test/data/android/device_files'),
+ 'content:content/test/data/android/device_files',
+ None),
I_TEST('ChromiumTestShell',
'ChromiumTestShell.apk',
'org.chromium.chrome.testshell',
'ChromiumTestShellTest',
- 'chrome:chrome/test/data/android/device_files'),
+ 'chrome:chrome/test/data/android/device_files',
+ constants.CHROMIUM_TEST_SHELL_HOST_DRIVEN_DIR),
I_TEST('AndroidWebView',
'AndroidWebView.apk',
'org.chromium.android_webview',
'AndroidWebViewTest',
- 'webview:android_webview/test/data/device_files'),
+ 'webview:android_webview/test/data/device_files',
+ None),
])
VALID_TESTS = set(['ui', 'unit', 'webkit', 'webkit_layout'])
@@ -171,6 +174,8 @@ def RunInstrumentationSuite(options, test):
if options.upload_to_flakiness_server:
args.append('--flakiness-dashboard-server=%s' %
constants.UPSTREAM_FLAKINESS_SERVER)
+ if test.host_driven_root:
+ args.append('--python_test_root=%s' % test.host_driven_root)
RunCmd(['build/android/run_instrumentation_tests.py'] + args)