diff options
| -rw-r--r-- | skia/config/SkUserConfig.h | 7 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index b66b8cf..e88e80c8 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -76,11 +76,8 @@ based on the presence or absence of NDEBUG, but that decision can be changed here. */ - -// Force SK_DEBUG even in release, so we get SkASSERTs. -// TODO(senorblanco): Remove this after a few reliability runs. -#define SK_DEBUG -#undef SK_RELEASE +//#define SK_DEBUG +//#define SK_RELEASE /* If, in debugging mode, Skia needs to stop (presumably to invoke a debugger) diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 1024b6b..8d31f77 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2705,13 +2705,13 @@ BUG18794 WIN MAC : LayoutTests/http/tests/mime/standard-mode-does-not-load-style BUG18802 WIN : LayoutTests/http/tests/misc/referrer.html = TIMEOUT PASS // Test failures caused by re-enabling skia asserts. -BUG18896 WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL -BUG18896 WIN LINUX : LayoutTests/svg/batik/paints/gradientLimit.svg = FAIL -BUG18896 WIN : LayoutTests/svg/carto.net/window.svg = FAIL -BUG18896 LINUX : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = FAIL -BUG18896 MAC WIN : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = PASS CRASH -BUG18896 LINUX : LayoutTests/svg/dynamic-updates/SVGClipPathElement-svgdom-clipPathUnits-prop.html = FAIL -BUG18896 LINUX : LayoutTests/svg/css/crash-css-generated-content.xhtml = FAIL +BUG18896 WIN DEBUG : LayoutTests/fast/backgrounds/svg-as-background-5.html = FAIL +BUG18896 WIN LINUX DEBUG : LayoutTests/svg/batik/paints/gradientLimit.svg = FAIL +BUG18896 WIN DEBUG : LayoutTests/svg/carto.net/window.svg = FAIL +BUG18896 LINUX DEBUG : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = FAIL +BUG18896 MAC WIN DEBUG : LayoutTests/svg/dynamic-updates/SVGClipPathElement-dom-clipPathUnits-attr.html = PASS CRASH +BUG18896 LINUX DEBUG : LayoutTests/svg/dynamic-updates/SVGClipPathElement-svgdom-clipPathUnits-prop.html = FAIL +BUG18896 LINUX DEBUG : LayoutTests/svg/css/crash-css-generated-content.xhtml = FAIL // Test failures from WebKit merge 46894 to 46977 BUG18939 : LayoutTests/fast/js/JSON-stringify-replacer.html = FAIL |