Work around all reftest-print reftests causing two assertions (Bug 534478) in the reftest harness to avoid lots of manifest annotation. (Bug 472557)
authorL. David Baron <dbaron@dbaron.org>
Sun, 13 Dec 2009 19:40:55 -0800
changeset 35707 4700e3c42868ce50db87ded6c7508a54a8043d13
parent 35706 89a4f5a6525a48c19277356d271403c80bf3e40c
child 35708 1c53517269200bd7436b7f15c04ef0dfdc1c45d0
push id10686
push userdbaron@mozilla.com
push dateMon, 14 Dec 2009 03:43:27 +0000
treeherdermozilla-central@4700e3c42868 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs534478, 472557
milestone1.9.3a1pre
Work around all reftest-print reftests causing two assertions (Bug 534478) in the reftest harness to avoid lots of manifest annotation. (Bug 472557)
layout/tools/reftest/reftest.js
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -692,16 +692,23 @@ function OnDocumentLoad(event)
 
        ps.headerStrLeft = "";
        ps.headerStrCenter = "";
        ps.headerStrRight = "";
        ps.footerStrLeft = "";
        ps.footerStrCenter = "";
        ps.footerStrRight = "";
        gBrowser.docShell.contentViewer.setPageMode(true, ps);
+
+       // WORKAROUND FOR ASSERTIONS IN BUG 534478:  Calling setPageMode
+       // above causes 2 assertions.  So that we don't have to annotate
+       // the manifests for every reftest-print reftest, bump the
+       // assertion count by two right here.
+       gURLs[0].minAsserts += 2;
+       gURLs[0].maxAsserts += 2;
     }
 
     setupZoom(contentRootElement);
 
     if (shouldWait()) {
         // The testcase will let us know when the test snapshot should be made.
         // Register a mutation listener to know when the 'reftest-wait' class
         // gets removed.