diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-09-30 11:28:39 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-09-30 11:28:39 -0700 |
| commit | b1619f1e1fe0590b7d57fa63823a0d4d3464338f (patch) | |
| tree | 3302ff23c0d927409292d96c529f5c6958c1cf17 /eclipse/plugins | |
| parent | ad5d6730be32ab38be880513502fc2fea0512c1b (diff) | |
| parent | fa063dab862bf76595739580f87c7bf803c42e43 (diff) | |
| download | sdk-b1619f1e1fe0590b7d57fa63823a0d4d3464338f.zip sdk-b1619f1e1fe0590b7d57fa63823a0d4d3464338f.tar.gz sdk-b1619f1e1fe0590b7d57fa63823a0d4d3464338f.tar.bz2 | |
Merge "Fix ddmlib test run failure and metric reporting."
Diffstat (limited to 'eclipse/plugins')
3 files changed, 5 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties index 2670316..730e673 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties @@ -33,7 +33,7 @@ AndroidJUnitTab_NoRunnerError=Instrumentation runner not specified AndroidJUnitTab_TestContainerText=Run all tests in the selected project, or package InstrValidator_NoTestLibMsg_s=The application does not declare uses-library %1$s InstrValidator_WrongRunnerTypeMsg_s=The instrumentation runner must be of type %1$s -RemoteAdtTestRunner_RunCompleteMsg=Test run complete +RemoteAdtTestRunner_RunCompleteMsg=Test run finished RemoteAdtTestRunner_RunFailedMsg_s=Test run failed: %1$s RemoteAdtTestRunner_RunTimeoutException=Connection with device timed out. RemoteAdtTestRunner_RunIOException_s=Lost connection with device: %s diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF index 9888108..549611f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF @@ -10,4 +10,5 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: kxml2-2.3.0.jar, ., layoutlib.jar, - groovy-all-1.7.0.jar + groovy-all-1.7.0.jar, + easymock.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties index 7be75ed..7c9915c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties @@ -11,5 +11,6 @@ bin.includes = META-INF/,\ unittests/com/android/sdklib/testdata/,\ unittests/com/android/layoutlib/testdata/,\ unittests/com/android/ide/eclipse/testdata/,\ - groovy-all-1.7.0.jar + groovy-all-1.7.0.jar,\ + easymock.jar |