summaryrefslogtreecommitdiffstats
path: root/build/android/single_test_runner.py
diff options
context:
space:
mode:
authorjrg@google.com <jrg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 18:47:45 +0000
committerjrg@google.com <jrg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 18:47:45 +0000
commit9bbaa585d56f7ba3f62997bac003d94e954645dc (patch)
treeb9bffcb0ecd8d03804868829a4578847bdea5067 /build/android/single_test_runner.py
parent3fd84030164d46c4c5390bfc5ab98f452f4e2df4 (diff)
downloadchromium_src-9bbaa585d56f7ba3f62997bac003d94e954645dc.zip
chromium_src-9bbaa585d56f7ba3f62997bac003d94e954645dc.tar.gz
chromium_src-9bbaa585d56f7ba3f62997bac003d94e954645dc.tar.bz2
Increase Android test robustness.
Use of the emulator is probably a lost cause, but maybe this can hold us for now. BUG=None TEST= Review URL: http://codereview.chromium.org/9185043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/single_test_runner.py')
-rw-r--r--build/android/single_test_runner.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/android/single_test_runner.py b/build/android/single_test_runner.py
index 8ec9501..ed422c1 100644
--- a/build/android/single_test_runner.py
+++ b/build/android/single_test_runner.py
@@ -31,7 +31,8 @@ class SingleTestRunner(BaseTestRunner):
def __init__(self, device, test_suite, gtest_filter, test_arguments, timeout,
rebaseline, performance_test, cleanup_test_files, tool,
- dump_debug_info=False):
+ dump_debug_info=False,
+ fast_and_loose=False):
BaseTestRunner.__init__(self, device)
self._running_on_emulator = self.device.startswith('emulator')
self._gtest_filter = gtest_filter
@@ -42,6 +43,7 @@ class SingleTestRunner(BaseTestRunner):
os.path.basename(test_suite), gtest_filter)
else:
self.dump_debug_info = None
+ self.fast_and_loose = fast_and_loose
self.test_package = TestPackageExecutable(self.adb, device,
test_suite, timeout, rebaseline, performance_test, cleanup_test_files,
@@ -205,7 +207,7 @@ class SingleTestRunner(BaseTestRunner):
self.test_package.StripAndCopyExecutable()
self.test_package.tool.CopyFiles()
test_data = self.GetDataFilesForTestSuite()
- if test_data:
+ if test_data and not self.fast_and_loose:
if self.test_package.test_suite_basename == 'page_cycler_tests':
# Since the test data for page cycler are huge (around 200M), we use
# sdcard to store the data and create symbol links to map them to