Summary: | Building of WK2 APIs using Python fails on Scratchbox | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Christian Sejersen <christian.webkit> | ||||||||
Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | commit-queue, dbates, kenneth, webkit.review.bot | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Other | ||||||||||
OS: | Linux | ||||||||||
Attachments: |
|
Description
Christian Sejersen
2010-10-19 03:40:19 PDT
Created attachment 71170 [details]
Patch to force use of Python 2.6 in Scratchbox
Comment on attachment 71170 [details] Patch to force use of Python 2.6 in Scratchbox View in context: https://bugs.webkit.org/attachment.cgi?id=71170&action=review > WebKit2/DerivedSources.pro:32 > +linux*:contains(QMAKE_HOST.arch, arm): { > + PYTHON = python2.6 > +} else { Are you sure this doesn't break anything? Like if someone builds for ARM without using scratchbox? The commit-queue encountered the following flaky tests while processing attachment 71170 [details]:
http/tests/security/xssAuditor/script-tag-with-source-entities.html
java/lc3/JSObject/ToObject-001.html
Please file bugs against the tests. The author(s) of the test(s) have been CCed on this bug. The commit-queue is continuing to process your patch.
The commit-queue encountered the following flaky tests while processing attachment 71170 [details]:
http/tests/appcache/404-manifest.html
Please file bugs against the tests. The author(s) of the test(s) have been CCed on this bug. The commit-queue is continuing to process your patch.
Comment on attachment 71170 [details] Patch to force use of Python 2.6 in Scratchbox Clearing flags on attachment: 71170 Committed r70061: <http://trac.webkit.org/changeset/70061> All reviewed patches have been landed. Closing bug. (In reply to comment #2) > (From update of attachment 71170 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71170&action=review > > > WebKit2/DerivedSources.pro:32 > > +linux*:contains(QMAKE_HOST.arch, arm): { > > + PYTHON = python2.6 > > +} else { > > Are you sure this doesn't break anything? Like if someone builds for ARM without using scratchbox? It certainly can break if there is no python2.6, so if there is a way to detect if it is Scratchbox, I can change it to use that. Created attachment 72505 [details]
Proper fix for detecting scratchbox
The previous patch (71170) will break when building in Scratchbox for a non-ARM target.
reopening Attachment 72505 [details] did not pass style-queue:
Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1
WebKit2/ChangeLog:6: Line contains tab character. [whitespace/tab] [5]
WebKit2/ChangeLog:7: Line contains tab character. [whitespace/tab] [5]
Total errors found: 2 in 2 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 72507 [details]
Same as sb-python-2.patch but without tabs
Removed tabs from Changelog
Comment on attachment 72507 [details]
Same as sb-python-2.patch but without tabs
LGTM.
Comment on attachment 72507 [details] Same as sb-python-2.patch but without tabs Clearing flags on attachment: 72507 Committed r71128: <http://trac.webkit.org/changeset/71128> All reviewed patches have been landed. Closing bug. |