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

This allows different test sets to use different test data, and in particular
allows new test sets, needing new data files, to be written without
modifying the core test system.

BUG=162395


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

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

1 files changed, 8 insertions, 1 deletions

diff --git a/build/android/pylib/test_options_parser.py b/build/android/pylib/test_options_parser.py
index 2a7d06a..cfe4c0c 100644
--- a/build/android/pylib/test_options_parser.py
+++ b/build/android/pylib/test_options_parser.py
@@ -137,7 +137,14 @@ def AddInstrumentationOptions(option_parser):
                                  'when test(s) fail.'))
   option_parser.add_option('--disable_assertions', action='store_true',
                            help='Run with java assertions disabled.')
-
+  option_parser.add_option('--test_data', action='append',
+                           help=('Each instance defines a directory of test '
+                                 'data that should be copied to the target(s) '
+                                 'before running the tests. The argument '
+                                 'should be of the form <target>:<source>, '
+                                 '<target> is relative to the device data'
+                                 'directory, and <source> is relative to the '
+                                 'chromium build directory.'))
 
 def ValidateInstrumentationOptions(option_parser, options, args):
   """Validate options/arguments and populate options with defaults."""