summaryrefslogtreecommitdiffstats
path: root/test-runner/src
diff options
context:
space:
mode:
authorquddusc <quddusc@google.com>2014-01-16 00:47:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-16 00:47:37 +0000
commitac6b332764264b1a940a3037434934582b9a9f68 (patch)
tree2060521aa89b5c38a0aab2dd4dd3e2c45f98ff37 /test-runner/src
parentf5749ac4efd154ff8cf4c8a7fdbb2c361e753edb (diff)
parente014eb6368f380545113fc115a6002da2d124726 (diff)
downloadframeworks_base-ac6b332764264b1a940a3037434934582b9a9f68.zip
frameworks_base-ac6b332764264b1a940a3037434934582b9a9f68.tar.gz
frameworks_base-ac6b332764264b1a940a3037434934582b9a9f68.tar.bz2
am e014eb63: am fc6b772f: am bf6d0797: am 2f1c2e32: am 3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360" into klp-docs
* commit 'e014eb6368f380545113fc115a6002da2d124726': docs: Fixed typo in InstrumentationTestRunner page. Bug: 11386360
Diffstat (limited to 'test-runner/src')
-rw-r--r--test-runner/src/android/test/InstrumentationTestRunner.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java
index 91d04da..db80ef9 100644
--- a/test-runner/src/android/test/InstrumentationTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationTestRunner.java
@@ -74,8 +74,9 @@ import junit.textui.ResultPrinter;
* <li>{@link android.test.ProviderTestCase}</li>
* <li>{@link android.test.ServiceTestCase}</li>
* <li>{@link android.test.SingleLaunchActivityTestCase}</li></ul>
- * <li>In an appropriate AndroidManifest.xml, define the this instrumentation with
- * the appropriate android:targetPackage set.
+ * <li>Set the <code>android:targetPackage</code> attribute of the <code>&lt;instrumentation&gt;</code>
+ * element in the test package's manifest. You should set the attribute value
+ * to the package name of the target application under test.
* <li>Run the instrumentation using "adb shell am instrument -w",
* with no optional arguments, to run all tests (except performance tests).
* <li>Run the instrumentation using "adb shell am instrument -w",