[Chromium] Updating fast/canvas/webgl/gl-teximage.html to prevent valid variations...

https://bugs.webkit.org/show_bug.cgi?id=89494

Patch by Jeff Timanus <twiz@chromium.org> on 2012-08-08
Reviewed by Adrienne Walker.

* fast/canvas/webgl/gl-teximage-expected.txt:
* fast/canvas/webgl/gl-teximage.html: Only display the actual percentage of passing pixels when outside of DRT.
* platform/chromium/TestExpectations:
* platform/efl/TestExpectations:
* platform/mac/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125099 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7765ab1..f21fdf5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2012-08-08  Jeff Timanus  <twiz@chromium.org>
+
+        [Chromium] Updating fast/canvas/webgl/gl-teximage.html to prevent valid variations in results from causing test failures.
+        https://bugs.webkit.org/show_bug.cgi?id=89494
+
+        Reviewed by Adrienne Walker.
+
+        * fast/canvas/webgl/gl-teximage-expected.txt:
+        * fast/canvas/webgl/gl-teximage.html: Only display the actual percentage of passing pixels when outside of DRT.
+        * platform/chromium/TestExpectations:
+        * platform/efl/TestExpectations:
+        * platform/mac/TestExpectations:
+
 2012-08-08  Dean Jackson  <dino@apple.com>
 
         Rebaseline fast/box-sizing/box-sizing.html and compositing/overflow/clip-descendents.html

diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt b/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt
index 33466e2..102db3d 100644 (file)
--- a/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt
@@ -48,19 +48,19 @@ PASS pixels should be same regardless of gamma settings.
 
 check pixels are UN pre-multiplied
 PASS getError was expected value: NO_ERROR : Should be no errors from setup.
-PASS Half the pixels in channel 0 should be >= 128,128,128. found 49%
-PASS Half the pixels in channel 0 should be < 128,128,128. found 51%
-PASS Half the pixels in channel 1 should be >= 128,128,128. found 49%
-PASS Half the pixels in channel 1 should be < 128,128,128. found 51%
-PASS Half the pixels in channel 2 should be >= 128,128,128. found 49%
-PASS Half the pixels in channel 2 should be < 128,128,128. found 51%
+PASS Half the pixels in channel 0 should be >= 128,128,128. 
+PASS Half the pixels in channel 0 should be < 128,128,128. 
+PASS Half the pixels in channel 1 should be >= 128,128,128. 
+PASS Half the pixels in channel 1 should be < 128,128,128. 
+PASS Half the pixels in channel 2 should be >= 128,128,128. 
+PASS Half the pixels in channel 2 should be < 128,128,128. 
 PASS getError was expected value: NO_ERROR : Should be no errors from setup.
-PASS Half the pixels in channel 0 should be >= 128,128,128. found 50%
-PASS Half the pixels in channel 0 should be < 128,128,128. found 50%
-PASS Half the pixels in channel 1 should be >= 128,128,128. found 50%
-PASS Half the pixels in channel 1 should be < 128,128,128. found 50%
-PASS Half the pixels in channel 2 should be >= 128,128,128. found 50%
-PASS Half the pixels in channel 2 should be < 128,128,128. found 50%
+PASS Half the pixels in channel 0 should be >= 128,128,128. 
+PASS Half the pixels in channel 0 should be < 128,128,128. 
+PASS Half the pixels in channel 1 should be >= 128,128,128. 
+PASS Half the pixels in channel 1 should be < 128,128,128. 
+PASS Half the pixels in channel 2 should be >= 128,128,128. 
+PASS Half the pixels in channel 2 should be < 128,128,128. 
 
 check canvas pixels are UN pre-multiplied
 PASS getError was expected value: NO_ERROR : Should be no errors from setup.

diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage.html b/LayoutTests/fast/canvas/webgl/gl-teximage.html
index e8c16dd..9418270 100644 (file)
--- a/LayoutTests/fast/canvas/webgl/gl-teximage.html
+++ b/LayoutTests/fast/canvas/webgl/gl-teximage.html
@@ -238,14 +238,19 @@ function runTests(imgs) {
     // Not sure the exact count here because gamma does effect drawing into the
     // canvas but it should be close to 50% so I'll pass 45%
     for (var jj = 0; jj < 3; ++jj) {
+      // Only display the actual percentage string when outside of the test
+      // harness, to prevent safe variation from causing failures.
+      var inDumpRenderTree = window.testRunner;
       assertMsg(ge128Count[jj] > 256 * 0.45,
                 "Half the pixels in channel " + jj +
-                " should be >= 128,128,128. found " +
-                ((ge128Count[jj] / 256) * 100).toFixed() + "%");
+                " should be >= 128,128,128. " +
+                (!inDumpRenderTree ? "found " +
+                    ((ge128Count[jj] / 256) * 100).toFixed() + "%" : ""));
       assertMsg(lt128Count[jj] > 256 * 0.45,
                 "Half the pixels in channel " + jj +
-                " should be < 128,128,128. found " +
-                ((lt128Count[jj] / 256) * 100).toFixed() + "%");
+                " should be < 128,128,128. " +
+                (!inDumpRenderTree ? "found " +
+                    ((lt128Count[jj] / 256) * 100).toFixed() + "%" : ""));
     }
   }
 
@@ -399,4 +404,3 @@ function runTests(imgs) {
 </script>
 </body>
 </html>
-

diff --git a/LayoutTests/platform/chromium/TestExpectations b/LayoutTests/platform/chromium/TestExpectations
index 8e735f2..77fa693 100644 (file)
--- a/LayoutTests/platform/chromium/TestExpectations
+++ b/LayoutTests/platform/chromium/TestExpectations
@@ -2264,7 +2264,6 @@ BUGCR71783 LION SNOWLEOPARD : scrollbars/custom-scrollbar-with-incomplete-style.
 // GPU
 /////////////////////////////////////////////////////////////////////////////
 
-BUGWK89494 : platform/chromium/virtual/gpu/fast/canvas/webgl/gl-teximage.html = TEXT
 
 BUGWK47923 : compositing/geometry/limit-layer-bounds-opacity-transition.html = TIMEOUT
 

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index ef26c91..826f875 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -853,8 +853,8 @@ BUGWK50485 SKIP : inspector/profiler/heap-snapshot-summary-sorting-instances.htm
 
 // Require rebaseline after bug 93148
 BUGWK93148 : tables/mozilla_expected_failures/bugs/bug106966.html = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html  = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html  = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html = TEXT
 BUGWK93148 : fast/css/nested-layers-with-hover.html = TEXT
 
 BUGWK92956 : http/tests/security/contentSecurityPolicy/object-src-url-blocked.html = TEXT

diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index dbdcc8c..e09d42f 100644 (file)
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -317,8 +317,8 @@ BUGWK91969 : fast/dom/HTMLProgressElement/indeterminate-progress-001.html = TEXT
 
 // Require rebaseline after bug 93148
 BUGWK93148 : tables/mozilla_expected_failures/bugs/bug106966.html = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html  = TEXT
-BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html  = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody.html = TEXT
+BUGWK93148 : tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr.html = TEXT
 BUGWK93148 : fast/css/nested-layers-with-hover.html = TEXT
 
 BUGWK93247 DEBUG : fast/lists/list-marker-remove-crash.html = CRASH