| Summary: | Extract common parts from jhbuildrc files. | ||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | ezisfake <Szanka.Peter> | ||||||||||||||||||||||||||||||||
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> | ||||||||||||||||||||||||||||||||
| Status: | RESOLVED FIXED | ||||||||||||||||||||||||||||||||||
| Severity: | Normal | CC: | commit-queue, d-r, galpeter, gtk-ews, gustavo, ltilve+ews, mrobinson, ossy, rego+ews, xan.lopez, zan | ||||||||||||||||||||||||||||||||
| Priority: | P2 | ||||||||||||||||||||||||||||||||||
| Version: | 528+ (Nightly build) | ||||||||||||||||||||||||||||||||||
| Hardware: | Unspecified | ||||||||||||||||||||||||||||||||||
| OS: | Unspecified | ||||||||||||||||||||||||||||||||||
| Bug Depends on: | 128311 | ||||||||||||||||||||||||||||||||||
| Bug Blocks: | |||||||||||||||||||||||||||||||||||
| Attachments: |
|
||||||||||||||||||||||||||||||||||
Created attachment 219648 [details]
patch
Created attachment 219650 [details]
patch
fixed some checkstyle warning
Attachment 219650 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/efl/common.py', u'Tools/efl/jhbuildrc', u'Tools/gtk/common.py', u'Tools/gtk/jhbuildrc', u'Tools/jhbuild/jhbuildrc_common.py', u'Tools/nix/common.py', u'Tools/nix/jhbuildrc', '--commit-queue']" exit_code: 1
ERROR: Tools/jhbuild/jhbuildrc_common.py:56: .has_key() is deprecated, use 'in' [pep8/W601] [5]
Total errors found: 1 in 5 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 219650 [details] patch Attachment 219650 [details] did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/48818030 Created attachment 221119 [details]
patch
*** Bug 81344 has been marked as a duplicate of this bug. *** Created attachment 221141 [details]
patch
Attachment 221141 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/efl/common.py', u'Tools/efl/jhbuildrc', u'Tools/gtk/common.py', u'Tools/gtk/find-make-dist-errors', u'Tools/gtk/generate-gtkdoc', u'Tools/gtk/jhbuildrc', u'Tools/jhbuild/jhbuildrc_common.py', u'Tools/nix/common.py', u'Tools/nix/jhbuildrc', '--commit-queue']" exit_code: 1
ERROR: Tools/jhbuild/jhbuildrc_common.py:56: .has_key() is deprecated, use 'in' [pep8/W601] [5]
Total errors found: 1 in 7 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 221141 [details] patch Attachment 221141 [details] did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/4690392855347200 Created attachment 221268 [details]
final patch ( i hope)
Comment on attachment 221268 [details]
final patch ( i hope)
LGTM, r=me
Comment on attachment 221268 [details] final patch ( i hope) Clearing flags on attachment: 221268 Committed r163530: <http://trac.webkit.org/changeset/163530> All reviewed patches have been landed. Closing bug. Re-opened since this is blocked by bug 128311 Created attachment 224392 [details]
Patch v6
This patch will extract common parts from jhbuildrc files, and fix run-gtk-test script too.
Comment on attachment 224392 [details]
Patch v6
Please add the jhbuildrc_common.py to the patch
Created attachment 224497 [details]
Patch v7
Added the missing jhbuildrc_common.py file.
Attachment 224497 [details] did not pass style-queue:
ERROR: Tools/jhbuild/jhbuildrc_common.py:21: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:25: expected 2 blank lines, found 1 [pep8/E302] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:26: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:27: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:29: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:31: expected 2 blank lines, found 1 [pep8/E302] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:32: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:34: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:34: expected 2 blank lines, found 1 [pep8/E302] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:35: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:36: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:38: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:38: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:40: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:41: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:42: whitespace after '[' [pep8/E201] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:42: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:43: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:44: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:46: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:47: whitespace after '[' [pep8/E201] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:47: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:48: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:49: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:51: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:52: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:53: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:54: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:55: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:55: missing whitespace after ',' [pep8/E231] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:56: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:56: missing whitespace after ',' [pep8/E231] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:58: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:59: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:60: blank line at end of file [pep8/W391] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:60: trailing whitespace [pep8/W291] [5]
Total errors found: 36 in 11 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 224507 [details]
Patch v8
The Tools/Scripts/update-webkit-[efl|gtk]libs now working.
Attachment 224507 [details] did not pass style-queue:
ERROR: Tools/jhbuild/jhbuildrc_common.py:21: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:25: expected 2 blank lines, found 1 [pep8/E302] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:26: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:27: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:29: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:31: expected 2 blank lines, found 1 [pep8/E302] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:32: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:34: expected 2 blank lines, found 1 [pep8/E302] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:35: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:36: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:37: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:38: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:39: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:40: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:41: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:42: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:43: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:44: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:45: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:46: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:47: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:48: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:49: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:50: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:51: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:52: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:53: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:54: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:55: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:56: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:57: trailing whitespace [pep8/W291] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:58: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:59: indentation is not a multiple of four [pep8/E111] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:60: blank line at end of file [pep8/W391] [5]
ERROR: Tools/jhbuild/jhbuildrc_common.py:60: trailing whitespace [pep8/W291] [5]
Total errors found: 35 in 11 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 224511 [details]
Patch v9
Style has been fixed.
Comment on attachment 224511 [details] Patch v9 The patch looks good to me, but the Nix part has gone away - https://trac.webkit.org/changeset/164360 , and please credit the original author in the changelog. Created attachment 224872 [details]
Patch v10
Removed the nix support
(In reply to comment #23) > Created an attachment (id=224872) [details] > Patch v10 It seems this patch contains modifications against an already existing 'jhbuildrc_common.py' file, which is clearly incorrect (it's not in the repo). The whole 'jhbuildrc_common.py' file should be in the patch as a new file. Comment on attachment 224872 [details]
Patch v10
r-, because the patch isn't appliable and the credit for the original author is still missing.
Created attachment 225053 [details]
Patch v11
The nix support removed, and added co-author.
Created attachment 225054 [details]
Patch v12
Updated patch
Created attachment 225057 [details]
Patch v13
Updated patch again
Attachment 225057 [details] did not pass style-queue:
ERROR: Tools/jhbuild/jhbuildrc_common.py:64: trailing whitespace [pep8/W291] [5]
Total errors found: 1 in 10 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 225059 [details]
Patch v14
Removed the trailing whitespace from Tools/jhbuild/jhbuildrc_common.py:64
Created attachment 225061 [details]
Patch v15
Added the missing line break to the end of the diff file...
Comment on attachment 225061 [details] Patch v15 Clearing flags on attachment: 225061 Committed r164585: <http://trac.webkit.org/changeset/164585> All reviewed patches have been landed. Closing bug. |
The Tools/{efl, nix, gtk}/jhbuildrc files have some common parts. Extract them to a file in Tools/jhbuild/