Diff
Modified: trunk/LayoutTests/ChangeLog (130708 => 130709)
--- trunk/LayoutTests/ChangeLog 2012-10-09 01:17:59 UTC (rev 130708)
+++ trunk/LayoutTests/ChangeLog 2012-10-09 01:36:26 UTC (rev 130709)
@@ -1,3 +1,18 @@
+2012-10-08 Dirk Pranke <[email protected]>
+
+ results.html and garden-o-matic are ignoring IMAGE failures when expected to FAIL
+ https://bugs.webkit.org/show_bug.cgi?id=98706
+
+ Reviewed by Ojan Vafai.
+
+ FAIL is supposed to map onto Failure which is supposed to map
+ onto the old [ TEXT, IMAGE_PLUS_TEXT, AUDIO ] mapping.
+ results.html was including IMAGE in this and garden-o-matic was
+ including CRASH and TIMEOUT as well :(.
+
+ * fast/harness/resources/results-test.js:
+ * fast/harness/results.html:
+
2012-10-08 Alpha Lam <[email protected]>
Not reviewed. Rebaselines for Chromium.
Modified: trunk/LayoutTests/fast/harness/resources/results-test.js (130708 => 130709)
--- trunk/LayoutTests/fast/harness/resources/results-test.js 2012-10-09 01:17:59 UTC (rev 130708)
+++ trunk/LayoutTests/fast/harness/resources/results-test.js 2012-10-09 01:36:26 UTC (rev 130709)
@@ -264,6 +264,12 @@
runDefaultSingleRowTest('bar-image.html', 'TEXT', 'IMAGE', 1, false, '', 'images diff (1%) ');
runDefaultSingleRowTest('bar-image-plus-text.html', 'TEXT', 'IMAGE+TEXT', 1, false, 'expected actual diff ', 'images diff (1%) ');
+ // test the mapping for FAIL onto only ['TEXT', 'IMAGE+TEXT', 'AUDIO']
+ runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE+TEXT', 1, true, 'expected actual diff ', 'images diff (1%) ');
+ runDefaultSingleRowTest('bar-image.html', 'FAIL', 'AUDIO', 1, true, 'expected audio actual audio ', '');
+ runDefaultSingleRowTest('bar-image.html', 'FAIL', 'TEXT', 0, true, 'expected actual diff ', '');
+ runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE', 1, false, '', 'images diff (1%) ');
+
results = mockResults();
results.tests['bar-reftest.html'] = mockExpectation('PASS', 'IMAGE', 1);
results.tests['bar-reftest.html'].reftest_type = ['=='];
Modified: trunk/LayoutTests/fast/harness/results.html (130708 => 130709)
--- trunk/LayoutTests/fast/harness/results.html 2012-10-09 01:17:59 UTC (rev 130708)
+++ trunk/LayoutTests/fast/harness/results.html 2012-10-09 01:36:26 UTC (rev 130709)
@@ -479,7 +479,7 @@
var actualValue = actualArray[i];
if (expectedArray.indexOf(actualValue) == -1 &&
(expectedArray.indexOf('FAIL') == -1 ||
- (actualValue != 'IMAGE' && actualValue != 'TEXT' && actualValue != 'IMAGE+TEXT')))
+ (actualValue != 'TEXT' && actualValue != 'IMAGE+TEXT' && actualValue != 'AUDIO')))
isExpected = false;
}
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js (130708 => 130709)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2012-10-09 01:17:59 UTC (rev 130708)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2012-10-09 01:36:26 UTC (rev 130709)
@@ -42,7 +42,7 @@
var AUDIO = 'AUDIO';
var MISSING = 'MISSING';
-var kFailingResults = [TIMEOUT, TEXT, CRASH, IMAGE, IMAGE_TEXT, AUDIO];
+var kFailingResults = [TEXT, IMAGE_TEXT, AUDIO];
var kExpectedImageSuffix = '-expected.png';
var kActualImageSuffix = '-actual.png';
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js (130708 => 130709)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js 2012-10-09 01:17:59 UTC (rev 130708)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js 2012-10-09 01:36:26 UTC (rev 130709)
@@ -84,7 +84,7 @@
"revision": "90430"
};
-test("ResultAnalyzer", 35, function() {
+test("ResultAnalyzer", 55, function() {
var analyzer;
analyzer = new results.ResultAnalyzer({expected: 'PASS', actual: 'TEXT'});
@@ -131,10 +131,38 @@
analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'TIMEOUT'});
ok(!analyzer.expectedToSucceed());
+ ok(analyzer.hasUnexpectedFailures());
+ deepEqual(analyzer.unexpectedResults(), ['TIMEOUT']);
+ ok(!analyzer.succeeded());
+ ok(!analyzer.flaky());
+
+ analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'IMAGE'});
+ ok(!analyzer.expectedToSucceed());
+ ok(analyzer.hasUnexpectedFailures());
+ deepEqual(analyzer.unexpectedResults(), ['IMAGE']);
+ ok(!analyzer.succeeded());
+ ok(!analyzer.flaky());
+
+ analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'AUDIO'});
+ ok(!analyzer.expectedToSucceed());
ok(!analyzer.hasUnexpectedFailures());
deepEqual(analyzer.unexpectedResults(), []);
ok(!analyzer.succeeded());
ok(!analyzer.flaky());
+
+ analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'TEXT'});
+ ok(!analyzer.expectedToSucceed());
+ ok(!analyzer.hasUnexpectedFailures());
+ deepEqual(analyzer.unexpectedResults(), []);
+ ok(!analyzer.succeeded());
+ ok(!analyzer.flaky());
+
+ analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'IMAGE+TEXT'});
+ ok(!analyzer.expectedToSucceed());
+ ok(!analyzer.hasUnexpectedFailures());
+ deepEqual(analyzer.unexpectedResults(), []);
+ ok(!analyzer.succeeded());
+ ok(!analyzer.flaky());
});
test("expectedFailures", 1, function() {
Modified: trunk/Tools/ChangeLog (130708 => 130709)
--- trunk/Tools/ChangeLog 2012-10-09 01:17:59 UTC (rev 130708)
+++ trunk/Tools/ChangeLog 2012-10-09 01:36:26 UTC (rev 130709)
@@ -1,3 +1,18 @@
+2012-10-08 Dirk Pranke <[email protected]>
+
+ results.html and garden-o-matic are ignoring IMAGE failures when expected to FAIL
+ https://bugs.webkit.org/show_bug.cgi?id=98706
+
+ Reviewed by Ojan Vafai.
+
+ FAIL is supposed to map onto Failure which is supposed to map
+ onto the old [ TEXT, IMAGE_PLUS_TEXT, AUDIO ] mapping.
+ results.html was including IMAGE in this and garden-o-matic was
+ including CRASH and TIMEOUT as well :(.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:
+
2012-10-08 Ryuan Choi <[email protected]>
[EFL] Build ControlTheme only when necessary
