Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix DumpRenderTree2 to correctly handle crashed tests"

Browse Source
This commit is contained in:
Steve Block
2010-10-19 02:50:06 -07:00
committed by Android (Google) Code Review
parent 8e5992ad66 24652bc958
commit 02f034220c
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/DumpRenderTree2/src/com/android/dumprendertree2/LayoutTestsExecutor.java
View File

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

5
tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java
View File

@@ -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.