summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantinos Menychtas <kmenychtas@google.com>2015-08-26 07:02:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-08-26 07:02:09 +0000
commit3ef75feec3d381d1243bb55184e39d6a643e11ae (patch)
treeb75c0aa47a1eb47d25657b6187f7dfa23d33d4ad
parent0ae78ca7aa4ec7c23704a8f870e1a47ba08b0c8b (diff)
parent270c003e616f6fb80a3d17a03d96aa893a03cb3c (diff)
downloadbase-emu-1.4-release.tar.gz
Merge "Check for test run failures before reporting a successful run" into emu-1.4-releaseemu-1.4-release
-rw-r--r--build-system/builder/src/main/java/com/android/builder/internal/testing/SimpleTestCallable.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-system/builder/src/main/java/com/android/builder/internal/testing/SimpleTestCallable.java b/build-system/builder/src/main/java/com/android/builder/internal/testing/SimpleTestCallable.java
index 46cbc1304e..8dcbbe8985 100644
--- a/build-system/builder/src/main/java/com/android/builder/internal/testing/SimpleTestCallable.java
+++ b/build-system/builder/src/main/java/com/android/builder/internal/testing/SimpleTestCallable.java
@@ -183,7 +183,7 @@ public class SimpleTestCallable implements Callable<Boolean> {
return false;
}
- return !testRunResult.hasFailedTests();
+ return !testRunResult.hasFailedTests() && !testRunResult.isRunFailure();
} catch (Exception e) {
Map<String, String> emptyMetrics = Collections.emptyMap();