diff options
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 10 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 7f16135..a3d544d 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -12,4 +12,12 @@ BUG_AJWONG MAC : fast/css/transformed-mask.html = IMAGE BUG10479 DEBUG MAC : svg/hixie/perf/001.xml = FAIL BUG10479 DEBUG MAC : svg/hixie/perf/002.xml = FAIL -BUG58481 WIN : fast/html/object-image-nested-fallback.html = CRASH
\ No newline at end of file +// Remove these when rolling past r69412 +BUGWEBGL MAC : fast/canvas/webgl/gl-uniform-arrays.html = TEXT +BUGWEBGL MAC : fast/canvas/webgl/object-deletion-behaviour.html = TEXT +BUGWEBGL MAC : fast/canvas/webgl/point-size.html = TEXT +BUGWEBGL MAC : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT +BUGWEBGL MAC : fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html = TIMEOUT +BUGWEBGL MAC : fast/canvas/webgl/uniform-location.html = TIMEOUT + +BUG58481 WIN : fast/html/object-image-nested-fallback.html = CRASH diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index 4ac1faa..b55681d 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -281,7 +281,7 @@ ['OS=="mac"', { 'product_name': 'TestShell', 'dependencies': [ - 'layout_test_helper', + 'layout_test_helper', 'copy_mesa', ], 'variables': { 'repack_path': '../../../tools/data_pack/repack.py', @@ -771,6 +771,15 @@ ], }, }, + { + 'target_name': 'copy_mesa', + 'type': 'none', + 'dependencies': ['<(DEPTH)/third_party/mesa/mesa.gyp:osmesa'], + 'copies': [{ + 'destination': '<(PRODUCT_DIR)/TestShell.app/Contents/MacOS/', + 'files': ['<(PRODUCT_DIR)/osmesa.so'], + }], + }, ], }], ], |