| Summary: | WebCore.gyp webcore_prerequisites needs some things moved into direct_dependent_settings | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Mark Mentovai <mark> | ||||||||
| Component: | WebCore Misc. | Assignee: | Mark Mentovai <mark> | ||||||||
| Status: | RESOLVED FIXED | ||||||||||
| Severity: | Normal | CC: | abarth, commit-queue, dglazkov, dpranke, eric, maruel, rsesek, webkit.review.bot | ||||||||
| Priority: | P2 | ||||||||||
| Version: | 528+ (Nightly build) | ||||||||||
| Hardware: | Other | ||||||||||
| OS: | OS X 10.5 | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Mark Mentovai
2011-02-02 14:43:39 PST
Created attachment 80976 [details] Fix v1 Chrome try runs in progress: http://build.chromium.org/p/tryserver.chromium/builders/mac/builds/11309 http://build.chromium.org/p/tryserver.chromium/builders/linux/builds/10901 http://build.chromium.org/p/tryserver.chromium/builders/win/builds/13703 Note for checkin: WebCore/WebCore.gyp/mac/check_objc_rename.sh needs to have the executable bit set. bash$ svn propset svn:executable '*' WebCore/WebCore.gyp/mac/check_objc_rename.sh Attachment 80976 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1
Source/WebCore/WebCore.gyp/WebCore.gyp:1025: Line contains tab character. [whitespace/tab] [5]
Total errors found: 1 in 3 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 80977 [details]
Fix v2 (no tabs)
Created attachment 81026 [details]
Fix v3 (no nm -U)
Apparently, nm -U (don’t display undefined symbols) is new in cctools 782 (Xcode 3.2.3). Chrome still needs to support 3.2.2 (and, for some real stragglers, 3.1.5), so the -U needs to go. This has no impact on the script, it’ll work just as well without -U.
Comment on attachment 81026 [details]
Fix v3 (no nm -U)
ok.
Comment on attachment 81026 [details] Fix v3 (no nm -U) Clearing flags on attachment: 81026 Committed r77562: <http://trac.webkit.org/changeset/77562> All reviewed patches have been landed. Closing bug. The commit-queue encountered the following flaky tests while processing attachment 81026 [details]: http/tests/websocket/tests/handshake-challenge-randomness.html bug 53738 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. I think this may have broken the mac build ... Committed r77589: <http://trac.webkit.org/changeset/77589> Dirk, can you please show me the Mac build break you encountered? OK, I found http://build.webkit.org/builders/Chromium%20Mac%20Release/builds/18787. The errors in the build log: PhaseScriptExecution "Postbuild \"Check Objective-C Rename\"" ../../WebKit/chromium/xcodebuild/WebCore.build/Release/webcore_html.build/Script-C80125C94888F34350BF52AA.sh cd /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release/build/Source/WebCore/WebCore.gyp /bin/sh -c /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release/build/Source/WebCore/WebCore.gyp/../../WebKit/chromium/xcodebuild/WebCore.build/Release/webcore_html.build/Script-C80125C94888F34350BF52AA.sh /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release/build/Source/WebCore/WebCore.gyp/../../WebKit/chromium/xcodebuild/WebCore.build/Release/webcore_html.build/Script-C80125C94888F34350BF52AA.sh: line 2: /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release/build/Source/WebCore/WebCore.gyp/mac/check_objc_rename.sh: Permission denied /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release/build/Source/WebCore/WebCore.gyp/../../WebKit/chromium/xcodebuild/WebCore.build/Release/webcore_html.build/Script-C80125C94888F34350BF52AA.sh: line 2: exec: /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release/build/Source/WebCore/WebCore.gyp/mac/check_objc_rename.sh: cannot execute: Unknown error: 0 and then mark@rj bash$ svn proplist -v http://svn.webkit.org/repository/webkit/trunk/Source/WebCore/WebCore.gyp/mac/check_objc_rename.sh@77562 mark@rj bash$ (as in “no properties set.”) This looks like check_objc_rename.sh was checked in without the svn:executable property set as I recommended in comment 1. When I asked Dimitri to commit-queue this, I also asked whether the commit-queue supported setting svn:executable, and he said he didn’t know but there was only one way to find out. :) The v3 patch from this patch set should be checked in manually, with the svn:executable property set properly on check_objc_rename.sh. Yup, that sounds like the problem. Thanks Mark! I imagine either Dimitri or I can land it manually in the morning. http://trac.webkit.org/changeset/77562 might have broken GTK Linux 32-bit Debug and GTK Linux 64-bit Debug The following tests are not passing: fast/events/pagehide-timeout.html (In reply to comment #13) > Yup, that sounds like the problem. Thanks Mark! I imagine either Dimitri or I can land it manually in the morning. I don't have an svn checkout. It ought to be easy to pull an svn tree to check this in. I guess there’s no way to set svn properties from git? Dirk, do you have a WebKit svn checkout handy? Yes, I do. I'll land it when I get into work in a little while. Committed r77663. <http://trac.webkit.org/changeset/77663> http://trac.webkit.org/changeset/77663 might have broken GTK Linux 32-bit Debug and GTK Linux 64-bit Debug The following tests are not passing: fast/blockflow/Kusa-Makura-background-canvas.html fast/blockflow/japanese-ruby-horizontal-bt.html fast/blockflow/japanese-ruby-vertical-lr.html fast/blockflow/japanese-ruby-vertical-rl.html fast/ruby/nested-ruby.html fast/text/emphasis-avoid-ruby.html |