Summary: | WebGL conformance test misc/functions-returning-strings.html fails | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Kenneth Russell <kbr> | ||||||||
Component: | WebGL | Assignee: | Ehsan Akhgari [:ehsan] <ehsan> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | cmarrin, dglazkov, ehsan, gman, kbr, webkit.review.bot, zmo | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | All | ||||||||||
OS: | All | ||||||||||
Attachments: |
|
Description
Kenneth Russell
2012-01-26 15:00:08 PST
See this bug for more information: http://www.khronos.org/bugzilla/show_bug.cgi?id=582 Created attachment 124741 [details]
Patch
Attachment 124741 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9
Updating OpenSource
First, rewinding head to replay your work on top of it...
Applying: Fix compilation errors on build-webkit --debug --no-workers on mac.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/qt/Skipped
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
Auto-merging Source/WebCore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
rebase refs/remotes/origin/master: command returned error: 1
Died at Tools/Scripts/update-webkit line 164.
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 124741 [details] Patch Attachment 124741 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11386012 New failing tests: fast/canvas/webgl/functions-returning-strings.html (In reply to comment #4) > (From update of attachment 124741 [details]) > Attachment 124741 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/11386012 > > New failing tests: > fast/canvas/webgl/functions-returning-strings.html Can I get a test log link for the failing test? Comment on attachment 124741 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124741&action=review Looks good overall; r- for a couple of relatively minor issues. Unfortunately I don't think it's possible to get the full test logs off the EWS bots; if you haven't already, build DumpRenderTree in your Chromium workspace and use src/webkit/tools/layout_tests/run_webkit_tests.sh to check the expected results. I'm doing this now and will update this bug if anything turns up. > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:5125 > + return WTF::emptyString(); 4 space indent. (Style queue should have caught this.) > Tools/ChangeLog:5 > + https://bugs.webkit.org/show_bug.cgi?id=77149 Please split this change off into a second bug. (In reply to comment #6) > (From update of attachment 124741 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=124741&action=review > > Looks good overall; r- for a couple of relatively minor issues. Unfortunately I don't think it's possible to get the full test logs off the EWS bots; if you haven't already, build DumpRenderTree in your Chromium workspace and use src/webkit/tools/layout_tests/run_webkit_tests.sh to check the expected results. I'm doing this now and will update this bug if anything turns up. I ran the tests locally with the default Mac bindings (whatever that's called, the one which runs WebCore under the Safari shell). > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:5125 > > + return WTF::emptyString(); > > 4 space indent. (Style queue should have caught this.) Will fix that (the style checking script didn't actually catch it). > > Tools/ChangeLog:5 > > + https://bugs.webkit.org/show_bug.cgi?id=77149 > > Please split this change off into a second bug. Will do. I split the second part of the patch to bug 77462. Created attachment 124791 [details]
Patch
Attachment 124791 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9
Updating OpenSource
First, rewinding head to replay your work on top of it...
Applying: Fix compilation errors on build-webkit --debug --no-workers on mac.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging LayoutTests/ChangeLog
CONFLICT (content): Merge conflict in LayoutTests/ChangeLog
Auto-merging LayoutTests/platform/qt/Skipped
CONFLICT (content): Merge conflict in LayoutTests/platform/qt/Skipped
Auto-merging Source/WebCore/ChangeLog
CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog
Auto-merging Source/WebCore/WebCore.exp.in
Auto-merging Source/WebKit/mac/ChangeLog
CONFLICT (content): Merge conflict in Source/WebKit/mac/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 Fix compilation errors on build-webkit --debug --no-workers on mac.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
rebase refs/remotes/origin/master: command returned error: 1
Died at Tools/Scripts/update-webkit line 164.
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 124791 [details]
Patch
Looks good. Let's see what the Chromium EWS bot has to say before cq+'ing it. r=me
Comment on attachment 124791 [details] Patch Attachment 124791 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11387103 New failing tests: fast/canvas/webgl/functions-returning-strings.html Comment on attachment 124791 [details]
Patch
The problem is in the test of getSupportedExtensions()' return value; if the implementation had a different number of extensions then the output would be different. I've updated the Khronos version of the test; please update the copy of the test in this patch and its expectations.
Good catch! What is the Khronos rev id which fixes this? It's Khronos r16797. Created attachment 124869 [details]
Patch
Comment on attachment 124869 [details] Patch This new patch is based on Khronos r16797. Comment on attachment 124869 [details]
Patch
Looks good. r=me
Let's wait for it to clear the EWS bots before cq+'ing it.
Comment on attachment 124869 [details] Patch Clearing flags on attachment: 124869 Committed r106873: <http://trac.webkit.org/changeset/106873> All reviewed patches have been landed. Closing bug. |