Merge "Fix DumpRenderTree2 to correctly handle crashed tests" (02f03422) · Commits · e / os / android_frameworks_base

tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java

+12 −9

Original line number	Diff line number	Diff line
		@@ -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);
		}

		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() {

+5 −0

Original line number	Diff line number	Diff line
		@@ -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.