Bug 1465107: Remove stylo from the reftest manifest parser. r?xidorn
MozReview-Commit-ID: BiZcNvrXBAJ
--- a/layout/tools/reftest/manifest.jsm
+++ b/layout/tools/reftest/manifest.jsm
@@ -317,26 +317,24 @@ function ReadManifest(aURL, aFilter)
(fuzzy_delta.min > 0 || fuzzy_pixels.min > 0)) {
throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": minimum fuzz must be zero for tests of type " + items[0];
}
var type = items[0];
if (g.compareRetainedDisplayLists) {
type = TYPE_REFTEST_EQUAL;
- // We expect twice as many assertion failures when running in
- // styloVsGecko mode because we run each test twice: once in
- // Stylo mode and once in Gecko mode.
+ // We expect twice as many assertion failures when comparing
+ // tests because we run each test twice.
minAsserts *= 2;
maxAsserts *= 2;
- // Skip the test if it is expected to fail in both Stylo and
- // Gecko modes. It would unexpectedly "pass" in styloVsGecko
- // mode when comparing the two failures, which is not a useful
- // result.
+ // Skip the test if it is expected to fail in both modes.
+ // It would unexpectedly "pass" in comparison mode mode when
+ // comparing the two failures, which is not a useful result.
if (expected_status === EXPECTED_FAIL ||
expected_status === EXPECTED_RANDOM) {
expected_status = EXPECTED_DEATH;
}
}
AddTestItem({ type: type,
expected: expected_status,
@@ -477,19 +475,16 @@ function BuildConditionSandbox(aURL) {
#else
sandbox.webrtc = false;
#endif
let retainedDisplayListsEnabled = prefs.getBoolPref("layout.display-list.retain", false);
sandbox.retainedDisplayLists = retainedDisplayListsEnabled && !g.compareRetainedDisplayLists;
sandbox.compareRetainedDisplayLists = g.compareRetainedDisplayLists;
-// TODO(emilio): Remove the remaining reftest expectations that mention stylo.
-sandbox.stylo = true;
-
sandbox.skiaPdf = false;
#ifdef RELEASE_OR_BETA
sandbox.release_or_beta = true;
#else
sandbox.release_or_beta = false;
#endif