Fix DumpRenderTree2 to correctly handle crashed tests

Change-Id: I894987d5b8f24ea31893aefe3cb6450c2736aa90

2 files changed, 17 insertions, 9 deletions

diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
index af8f6ea..58f7183 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
@@ -404,23 +404,26 @@ public class LayoutTestsExecutor extends Activity {
     }
 
     private void startTests() {
+        if (mCurrentTestIndex == 0) {
+            sendFirstTestMessage();
+        }
+
+        runNextTest();
+    }
+
+    private void sendFirstTestMessage() {
         try {
-            Message serviceMsg =
-                    Message.obtain(null, ManagerService.MSG_FIRST_TEST);
+            Message serviceMsg = Message.obtain(null, ManagerService.MSG_FIRST_TEST);
 
             Bundle bundle = new Bundle();
-            if (!mTestsList.isEmpty()) {
-                bundle.putString("firstTest", mTestsList.get(0));
-                bundle.putInt("index", mCurrentTestIndex);
-            }
+            bundle.putString("firstTest", mTestsList.get(0));
+            bundle.putInt("index", mCurrentTestIndex);
 
             serviceMsg.setData(bundle);
             mManagerServiceMessenger.send(serviceMsg);
         } catch (RemoteException e) {
-            Log.e(LOG_TAG, "mCurrentTestRelativePath=" + mCurrentTestRelativePath, e);
+            Log.e(LOG_TAG, "Error sending message to manager service:", e);
         }
-
-        runNextTest();
     }
 
     private void runNextTest() {
diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
index 8d01a53..bd8c4ad 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
@@ -539,6 +539,11 @@ public class Summarizer {
         String textSource = result.getExpectedTextResultPath();
         String imageSource = result.getExpectedImageResultPath();
 
+        if (result.didCrash()) {
+            html.append("<span class=\"source\">Did not look for expected results</span>");
+            return;
+        }
+
         if (textSource == null) {
             // Show if a text result is missing. We may want to revisit this decision when we add
             // support for image results.