Bug 937994 - Part 2: Mark some tests fuzzy, and change the discontinuity side of joins they expect. r=dholbert
authorBas Schouten <bschouten@mozilla.com>
Mon, 18 Nov 2013 01:29:05 +0000
changeset 155119 a08baab2e6f35fe023d32bd3b98037b9ef97960c
parent 155118 df19d2da7e2ed78037936f60c5fe8b5293cb2440
child 155120 4f086025350f6bdad1e216dc3fa31030d8ce156d
push id25662
push useremorley@mozilla.com
push dateMon, 18 Nov 2013 10:53:03 +0000
treeherdermozilla-central@59f6274ce8f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs937994
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 937994 - Part 2: Mark some tests fuzzy, and change the discontinuity side of joins they expect. r=dholbert
content/smil/test/db_smilAnimateMotion.js
content/smil/test/smilTestUtils.js
content/svg/content/test/test_text.html
layout/reftests/svg/text/reftest.list
--- a/content/smil/test/db_smilAnimateMotion.js
+++ b/content/smil/test/db_smilAnimateMotion.js
@@ -22,35 +22,35 @@ var _reusedCTMLists = {
                     ctm1_6: [105, 205, Math.PI/3],
                     ctm1_3: [110, 210, Math.PI/3],
                     ctm2_3: [120, 220, Math.PI/3],
                     ctm1:   [130, 210, Math.PI/3]
   },
   pacedRAuto:     { ctm0:   [100, 200, Math.PI/4],
                     ctm1_6: [105, 205, Math.PI/4],
                     ctm1_3: [110, 210, Math.PI/4],
-                    ctm2_3: [120, 220, Math.PI/4],
+                    ctm2_3: [120, 220, -Math.PI/4],
                     ctm1:   [130, 210, -Math.PI/4]
   },
   pacedRAutoReverse : { ctm0:   [100, 200, 5*Math.PI/4],
                         ctm1_6: [105, 205, 5*Math.PI/4],
                         ctm1_3: [110, 210, 5*Math.PI/4],
-                        ctm2_3: [120, 220, 5*Math.PI/4],
+                        ctm2_3: [120, 220, 3*Math.PI/4],
                         ctm1:   [130, 210, 3*Math.PI/4]
   },
   
   discreteBasic : { ctm0:   [100, 200, 0],
                     ctm1_6: [100, 200, 0],
                     ctm1_3: [120, 220, 0],
                     ctm2_3: [130, 210, 0],
                     ctm1:   [130, 210, 0]
   },
   discreteRAuto : { ctm0:   [100, 200, Math.PI/4],
                     ctm1_6: [100, 200, Math.PI/4],
-                    ctm1_3: [120, 220, Math.PI/4],
+                    ctm1_3: [120, 220, -Math.PI/4],
                     ctm2_3: [130, 210, -Math.PI/4],
                     ctm1:   [130, 210, -Math.PI/4]
   },
   justMoveBasic : { ctm0:   [40, 80, 0],
                     ctm1_6: [40, 80, 0],
                     ctm1_3: [40, 80, 0],
                     ctm2_3: [40, 80, 0],
                     ctm1:   [40, 80, 0]
--- a/content/smil/test/smilTestUtils.js
+++ b/content/smil/test/smilTestUtils.js
@@ -171,17 +171,17 @@ var CTMUtil =
     var newCtm = { a : cosTheta,  c: -sinTheta,  e: tX,
                    b : sinTheta,  d:  cosTheta,  f: tY  };
     return newCtm;
   },
 
   /// Helper for isCtmEqual
   isWithinDelta : function(aTestVal, aExpectedVal, aErrMsg, aIsTodo) {
     var testFunc = aIsTodo ? todo : ok;
-    const delta = 0.000001; // allowing margin of error = 10^-6
+    const delta = 0.00001; // allowing margin of error = 10^-5
     ok(aTestVal >= aExpectedVal - delta &&
        aTestVal <= aExpectedVal + delta,
        aErrMsg + " | got: " + aTestVal + ", expected: " + aExpectedVal);
   },
 
   assertCTMEqual : function(aLeftCtm, aRightCtm, aComponentsToCheck,
                             aErrMsg, aIsTodo) {
     var foundCTMDifference = false;
--- a/content/svg/content/test/test_text.html
+++ b/content/svg/content/test/test_text.html
@@ -99,25 +99,25 @@ function runTest()
   is(text2.getComputedTextLength(), text2.getSubStringLength(0, 3), "text2 substring length");
   isPoint(text2.getStartPositionOfChar(0), 100, 125, "text2 char 0 start offset");
   isPoint(text2.getStartPositionOfChar(1), 100, 125 + charWidth, "text2 char 1 start offset");
   isPoint(text2.getStartPositionOfChar(2), 100, 125 + 2*charWidth, "text2 char 2 start offset");
   isPoint(text2.getEndPositionOfChar(0), 100, 125 + charWidth, "text2 char 0 end offset");
   isPoint(text2.getEndPositionOfChar(1), 100, 125 + 2*charWidth, "text2 char 1 end offset");
   isPoint(text2.getEndPositionOfChar(2), 100, 125 + 3*charWidth, "text2 char 2 end offset");
   is(text2.getExtentOfChar(0).y, 125, "text2 char 0 extent y");
-  is(text2.getExtentOfChar(0).height, charWidth, "text2 char 0 extent height");
+  isfuzzy(text2.getExtentOfChar(0).height, charWidth, 0.000001, "text2 char 0 extent height");
   ok(text2.getExtentOfChar(0).width < 100, "text2 char 0 extent x");
   ok(xmost(text2.getExtentOfChar(0)) > 100, "text2 char 0 extent width");
   is(text2.getExtentOfChar(1).y, 125 + charWidth, "text2 char 1 extent x");
-  is(text2.getExtentOfChar(1).height, text2.getSubStringLength(0, 1), "text2 char 1 extent width");
+  isfuzzy(text2.getExtentOfChar(1).height, text2.getSubStringLength(0, 1), 0.000001, "text2 char 1 extent width");
   is(text2.getExtentOfChar(1).x, text2.getExtentOfChar(0).x, "text2 char 0/1 extent y");
   is(text2.getExtentOfChar(1).width, text2.getExtentOfChar(0).width, "text2 char 0/1 extent height");
   is(text2.getExtentOfChar(2).y, 125 + 2*charWidth, "text2 char 2 extent x");
-  is(text2.getExtentOfChar(2).height, text2.getSubStringLength(0, 1), "text2 char 2 extent width");
+  isfuzzy(text2.getExtentOfChar(2).height, text2.getSubStringLength(0, 1), 0.000001, "text2 char 2 extent width");
   is(text2.getExtentOfChar(2).x, text2.getExtentOfChar(0).x, "text2 char 0/2 extent y");
   is(text2.getExtentOfChar(2).width, text2.getExtentOfChar(0).width, "text2 char 0/2 extent height");
   is(text2.getRotationOfChar(0), 90, "text2 char 0 rotation");
   is(text2.getRotationOfChar(1), 90, "text2 char 0 rotation");
   is(text2.getRotationOfChar(2), 90, "text2 char 0 rotation");
   p.y = 125 + 0.1;
   p.x = 100;
   is(text2.getCharNumAtPosition(p), 0, "text2 finding char 0 top edge");
--- a/layout/reftests/svg/text/reftest.list
+++ b/layout/reftests/svg/text/reftest.list
@@ -119,17 +119,17 @@ HTTP(../..) == simple-transform-rotate.s
 == textpath-invalid-parent.svg textpath-invalid-parent-ref.svg
 == textpath-multiline.svg textpath-multiline-ref.svg
 == textpath-multiline-2.svg textpath-multiline-2-ref.svg
 == textpath-after.svg textpath-after-ref.svg
 == textpath-after-anchor-end.svg textpath-after-anchor-end-ref.svg
 
 == textLength.svg textLength-ref.svg
 == textLength-2.svg textLength-2-ref.svg
-fuzzy-if(/^Windows\x20NT\x206\.[12]/.test(http.oscpu),1,6) == textLength-3.svg textLength-3-ref.svg
+fuzzy-if(/^Windows\x20NT\x206\.[12]/.test(http.oscpu),4,15) == textLength-3.svg textLength-3-ref.svg
 == textLength-4.svg textLength-4-ref.svg
 == textLength-5.svg textLength-5-ref.svg
 == textLength-6.svg textLength-6-ref.svg
 
 # tests for ignoring various properties
 == ignore-border.svg ignore-prop-ref.svg
 == ignore-display.svg ignore-display-ref.svg
 == ignore-float.svg ignore-prop-ref.svg