Merge ~bryce/ubuntu/+source/php-parser:merge-v4.10.3-1-hirsute into ubuntu/+source/php-parser:ubuntu/devel
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Bryce Harrington | ||||
Proposed branch: | ~bryce/ubuntu/+source/php-parser:merge-v4.10.3-1-hirsute | ||||
Merge into: | ubuntu/+source/php-parser:ubuntu/devel | ||||
Diff against target: |
211 lines (+164/-1) 5 files modified
debian/changelog (+32/-0) debian/control (+2/-1) debian/patches/0003-Disable-new-test-cases-not-yet-32-bit-compatible.patch (+57/-0) debian/patches/0004-Disable-CodeParsingTest-due-to-integer-syntax.patch (+71/-0) debian/patches/series (+2/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Durigan Junior (community) | Needs Fixing | ||
git-ubuntu developers | Pending | ||
Canonical Server | Pending | ||
Ubuntu Server Developers | Pending | ||
Review via email: mp+395546@code.launchpad.net |
Description of the change
Straightforward merge of php-parser carrying the delta forward.
Upstream did a bunch of work on their tests, including the test cases we had disabled, so I tried a sync hoping they had fixed the issues but just hadn't updated the bug report we sent them. Unfortunately, the exact same armhf issues cropped up, so no dice.
Anyway, because of that sync attempt, I merged manually rather than through the traditional git ubuntu merge process, so there aren't the usual tags.
I took some time looking through upstream's changes to tests, and also into why the tests are failing. But I didn't want to devote too much time to that this cycle so timeboxed it when I didn't uncover any insights. The patches are a bit brute force and could be better constrained (e.g. only take affect for armhf), however I think when time is more available it would be worth figuring out exactly what's failing, or perhaps work closer with upstream so they can understand/
PPA: https:/
I'm reviewing this one.