summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/testing
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-29 14:35:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-29 14:35:34 -0700
commitac1807ab1d90a531550ee07356c52fe05abae32d (patch)
treef9d3661e10929cf1b47360081d26a2be002cef04 /docs/html/tools/testing
parent138ad7ba1b59f6105d1f79966e616f5970970ef3 (diff)
parentacf47ca6331f6e9576e9970ec8b657e068cc02cb (diff)
downloadframeworks_base-ac1807ab1d90a531550ee07356c52fe05abae32d.zip
frameworks_base-ac1807ab1d90a531550ee07356c52fe05abae32d.tar.gz
frameworks_base-ac1807ab1d90a531550ee07356c52fe05abae32d.tar.bz2
am acf47ca6: am da03abb6: am addfe2be: am d51a557a: Merge "Doc update: obsolete ant target." into jb-mr1.1-docs
* commit 'acf47ca6331f6e9576e9970ec8b657e068cc02cb': Doc update: obsolete ant target.
Diffstat (limited to 'docs/html/tools/testing')
-rw-r--r--docs/html/tools/testing/testing_otheride.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/tools/testing/testing_otheride.jd b/docs/html/tools/testing/testing_otheride.jd
index 0678f52..9484158 100644
--- a/docs/html/tools/testing/testing_otheride.jd
+++ b/docs/html/tools/testing/testing_otheride.jd
@@ -75,9 +75,9 @@ parent.link=index.html
<p>
You use the <code>android</code> tool to create test projects.
You also use <code>android</code> to convert existing test code into an Android test project,
- or to add the <code>run-tests</code> Ant target to an existing Android test project.
+ or to add the <code>test</code> Ant target to an existing Android test project.
These operations are described in more detail in the section <a href="#UpdateTestProject">
- Updating a test project</a>. The <code>run-tests</code> target is described in
+ Updating a test project</a>. The <code>test</code> target is described in
<a href="#RunTestsAnt">Quick build and run with Ant</a>.
</p>
<h3 id="CreateTestProject">Creating a test project</h3>
@@ -300,7 +300,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd
<h3 id="RunTestsAnt">Quick build and run with Ant</h3>
<p>
You can use Ant to run all the tests in your test project, using the target
- <code>run-tests</code>, which is created automatically when you create a test project with
+ <code>test</code>, which is created automatically when you create a test project with
the <code>android</code> tool.
</p>
<p>