| Summary: | Import Dromaeo to WebKit repository | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Hajime Morrita <morrita> | ||||||||
| Component: | Tools / Tests | Assignee: | Hajime Morrita <morrita> | ||||||||
| Status: | RESOLVED FIXED | ||||||||||
| Severity: | Normal | CC: | abarth, kling, koivisto, rniwa, tony, webkit.review.bot | ||||||||
| Priority: | P2 | ||||||||||
| Version: | 528+ (Nightly build) | ||||||||||
| Hardware: | Unspecified | ||||||||||
| OS: | Unspecified | ||||||||||
| Bug Depends on: | |||||||||||
| Bug Blocks: | 76156 | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Hajime Morrita
2012-01-30 04:12:05 PST
I think it's better to have a copy in the repository. I don't wanna see us re-creating the gclient nightmare. How big is Dromaeo? About 10MB but test themselves are only 3.5MB: https://github.com/jeresig/dromaeo 3.5 MB sounds fine to import wholesale. (In reply to comment #4) > 3.5 MB sounds fine to import wholesale. I thought we should pull it from the original source to make update easy. But maybe it's OK to have our own copy seeing Dromaeo doesn't have any big change these days. I'll take that way. (In reply to comment #5) > I thought we should pull it from the original source to make update easy. > But maybe it's OK to have our own copy seeing Dromaeo doesn't have any big change these days. > I'll take that way. I think importing will be better. For example, if we decide to import newer version of Dromaeo in the future, we can put in a separate directory in order to run both versions for a while. Created attachment 124693 [details]
Patch - Uploading manually because it's too big.
Attachment 124693 [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.
JSON.php is licensed under old BSD license, which is NOT compatible with GPL. So we can't land this as is. But given these aren't http tests, we don't need it, right? also, we probably don't need json.js since WebKit implements JSON. Alos, you may need to update some files after http://trac.webkit.org/changeset/106379. Created attachment 124849 [details]
Updated Patch
Oops the patch was wrong. But I cannot obsolete it because the page cannot finish loading. Created attachment 124857 [details]
Removed BSD-licensed files.
- The style errors are false positive. they came from third party libraries. - The bots failed to apply the patch because it was too big for them. r=me Unfortunately, the stupid iframe in Details page is preventing me from setting r+ so I can't set the flag on the actual patch. Committed r106425: <http://trac.webkit.org/changeset/106425> |