diff options
| author | Raphael Moll <ralf@android.com> | 2010-08-28 15:36:34 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2010-08-28 15:36:34 -0700 |
| commit | 58af29178216fafaf0f19d3aac0f74b733503e29 (patch) | |
| tree | 54cebee010a94071c615fab549a7fcc3a7484343 | |
| parent | 34ac12032875a3e3d0b17d19540cb65d0fbbe507 (diff) | |
| download | sdk-58af29178216fafaf0f19d3aac0f74b733503e29.zip sdk-58af29178216fafaf0f19d3aac0f74b733503e29.tar.gz sdk-58af29178216fafaf0f19d3aac0f74b733503e29.tar.bz2 | |
Fix Eclipse build.
Provides dummy implementations of the new testEnded() method.
Change-Id: Iaa9183e0fe89d162572ab2c77c9ba1b23c14a41c
3 files changed, 9 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java index 64e93b8..7ba1b2f 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java @@ -197,6 +197,10 @@ public class RemoteAdtTestRunner extends RemoteTestRunner { mExecution.getListener().notifyTestEnded(new TestCaseReference(test)); } + public void testEnded(TestIdentifier test, Map<String, String> testMetrics) { + mExecution.getListener().notifyTestEnded(new TestCaseReference(test)); + } + /* (non-Javadoc) * @see com.android.ddmlib.testrunner.ITestRunListener#testFailed(com.android.ddmlib.testrunner.ITestRunListener.TestFailure, com.android.ddmlib.testrunner.TestIdentifier, java.lang.String) */ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java index da4abda..c5f52c8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/TestCollector.java @@ -48,6 +48,10 @@ class TestCollector implements ITestRunListener { // ignore } + public void testEnded(TestIdentifier test, Map<String, String> testMetrics) { + // ignore + } + /* (non-Javadoc) * @see com.android.ddmlib.testrunner.ITestRunListener#testFailed(com.android.ddmlib.testrunner.ITestRunListener.TestFailure, com.android.ddmlib.testrunner.TestIdentifier, java.lang.String) */ diff --git a/eclipse/scripts/build_plugins.sh b/eclipse/scripts/build_plugins.sh index 1093fb2..ab2cbe2 100755 --- a/eclipse/scripts/build_plugins.sh +++ b/eclipse/scripts/build_plugins.sh @@ -184,7 +184,7 @@ find . -name "@*" | xargs rm -rfv # Now execute the ant runner -set +e # don't stop on errors anymore, we want to catch there here +set +e # don't stop on errors anymore, we want to catch them here java \ -jar $LAUNCHER \ |