Changeset 122281 in webkit


Ignore:
Timestamp:
Jul 10, 2012 5:18:35 PM (12 years ago)
Author:
kbr@google.com
Message:

Line directive test in fast/canvas/webgl/glsl-conformance.html is incorrect
​https://bugs.webkit.org/show_bug.cgi?id=90897

Reviewed by Adrienne Walker.

Removed an invalid test and adjusted the test expectations.

  • fast/canvas/webgl/glsl-conformance-expected.txt:
  • fast/canvas/webgl/glsl-conformance.html:
  • platform/chromium/TestExpectations:
Location:
trunk/LayoutTests
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r122278 r122281  
     12012-07-10  Kenneth Russell  <kbr@google.com>
     2
     3        Line directive test in fast/canvas/webgl/glsl-conformance.html is incorrect
     4        https://bugs.webkit.org/show_bug.cgi?id=90897
     5
     6        Reviewed by Adrienne Walker.
     7
     8        Removed an invalid test and adjusted the test expectations.
     9
     10        * fast/canvas/webgl/glsl-conformance-expected.txt:
     11        * fast/canvas/webgl/glsl-conformance.html:
     12        * platform/chromium/TestExpectations:
     13
    1142012-07-10  Philip Rogers  <pdr@google.com>
    215

  • trunk/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt

    r76063 r122281  
    2929PASS [vshaderWithVersion120/fshader]: vertex shader uses the #version not 100 directive should fail
    3030PASS [vshaderWithVersion100/fshader]: vertex shader uses the #version 100 directive should succeed
    31 PASS [vshaderWithLineDirective/fshader]: vertex shader uses #line directive should report correct line
    3231PASS [shaders/implicit/add_int_float.vert/fshader]: implicit cast adding integer to float should fail
    3332PASS [shaders/implicit/add_int_mat2.vert/fshader]: implicit cast adding integer to mat2 should fail

  • trunk/LayoutTests/fast/canvas/webgl/glsl-conformance.html

    r98407 r122281  
    212212}
    213213</script>
    214 <script id="vshaderWithLineDirective" type="text/something-not-javascript">
    215 #line 123
    216 foo
    217 </script>
    218214<script id="vshaderWith__FILE__" type="text/something-not-javascript">
    219215__FILE__
    … …  
    405401      passMsg: 'vertex shader uses the #version 100 directive should succeed',
    406402    },
    407     { vShaderId: 'vshaderWithLineDirective',
    408       vShaderSuccess: false,
    409       vShaderTest: (function() { return wtu.getLastError().indexOf("124") >= 0; }),
    410       fShaderId: 'fshader',
    411       fShaderSuccess: true,
    412       linkSuccess: false,
    413       passMsg: 'vertex shader uses #line directive should report correct line',
    414     }
    415403  ];
    416404

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r122265 r122281  
    37503750BUGWK90746 : fast/multicol/column-span-parent-continuation-crash.html = PASS TIMEOUT
    37513751
    3752 BUGCR136441 : fast/canvas/webgl/glsl-conformance.html = TEXT
    3753 BUGCR136441 : platform/chromium/virtual/gpu/fast/canvas/webgl/glsl-conformance.html = TEXT
    3754 
    37553752// Flaky
    37563753BUGWK90896 WIN DEBUG : fast/js/dfg-cross-global-object-inline-new-array-literal.html = PASS TEXT
Note: See TracChangeset for help on using the changeset viewer.