summaryrefslogtreecommitdiffstats
path: root/testrunner/test_defs
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@android.com>2010-02-20 20:09:58 -0800
committerBrett Chabot <brettchabot@android.com>2010-02-23 12:17:15 -0800
commitc061154208c924fc31100bc453d9f698d4654703 (patch)
tree166af9788aeef5daf967a3e89ff12d640fbdc159 /testrunner/test_defs
parentfbef7e0b8540d0199310297a34092f651ce829fb (diff)
downloadandroid_development-c061154208c924fc31100bc453d9f698d4654703.tar.gz
android_development-c061154208c924fc31100bc453d9f698d4654703.tar.bz2
android_development-c061154208c924fc31100bc453d9f698d4654703.zip
Add "annotation" and "not-annotation" args to runtest.
Bug 2239240 Change-Id: I49bbee4b74e8b0a51b6e6144818a7e9c08b1b5c2
Diffstat (limited to 'testrunner/test_defs')
-rw-r--r--testrunner/test_defs/instrumentation_test.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/testrunner/test_defs/instrumentation_test.py b/testrunner/test_defs/instrumentation_test.py
index c932a0be3..f0a8656bb 100644
--- a/testrunner/test_defs/instrumentation_test.py
+++ b/testrunner/test_defs/instrumentation_test.py
@@ -131,6 +131,10 @@ class InstrumentationTestSuite(test_suite.AbstractTestSuite):
instrumentation_args["suiteAssignment"] = "true"
if options.coverage:
instrumentation_args["coverage"] = "true"
+ if options.test_annotation:
+ instrumentation_args["annotation"] = options.test_annotation
+ if options.test_not_annotation:
+ instrumentation_args["notAnnotation"] = options.test_not_annotation
if options.preview:
adb_cmd = adb.PreviewInstrumentationCommand(
package_name=self.GetPackageName(),