am 698c04c: AI 148525: CTS: Rerun currently running test when batch mode
Merge commit '698c04cca376dc073be4ba7ee752b24bb6966c47' into donut
* commit '698c04cca376dc073be4ba7ee752b24bb6966c47':
AI 148525: CTS: Rerun currently running test when batch mode terminates abruptly
diff --git a/tools/host/src/com/android/cts/TestPackage.java b/tools/host/src/com/android/cts/TestPackage.java
index 5bb0553..3f21e56 100644
--- a/tools/host/src/com/android/cts/TestPackage.java
+++ b/tools/host/src/com/android/cts/TestPackage.java
@@ -515,7 +515,9 @@
synchronized (mTimeOutTimer) {
mTimeOutTimer.cancel(false);
}
- mCurrentTest.setResult(new CtsTestResult(CtsTestResult.CODE_FAIL, null, null));
+ // The currently running test did not report a result. Mark it as not executed, so that it
+ // will be run again in individual mode.
+ mCurrentTest.setResult(new CtsTestResult(CtsTestResult.CODE_NOT_EXECUTED, null, null));
mCurrentTest = null;
}