Merge lp://qastaging/~james-page/ubuntu/precise/zookeeper/arm-ftbfs-fixes into lp://qastaging/ubuntu/precise/zookeeper

Proposed by James Page
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp://qastaging/~james-page/ubuntu/precise/zookeeper/arm-ftbfs-fixes
Merge into: lp://qastaging/ubuntu/precise/zookeeper
Diff against target: 214 lines (+135/-13)
7 files modified
.pc/applied-patches (+1/-0)
.pc/fixes/ZOOKEEPER-1374/src/c/tests/ThreadingUtil.cc (+79/-0)
debian/changelog (+11/-0)
debian/patches/fixes/ZOOKEEPER-1374 (+38/-0)
debian/patches/series (+1/-0)
debian/rules (+3/-0)
src/c/tests/ThreadingUtil.cc (+2/-13)
To merge this branch: bzr merge lp://qastaging/~james-page/ubuntu/precise/zookeeper/arm-ftbfs-fixes
Reviewer Review Type Date Requested Status
Matthias Klose Approve
Clint Byrum Pending
Review via email: mp+89940@code.qastaging.launchpad.net

Description of the change

This MP addresses testing on armel/armhf:

1) The current upstream C test code is not compatible with arm; patched to use _sync_* primitives rather than ASM code for atomic operations in the test code. Reported upstream with patch submitted https://issues.apache.org/jira/browse/ZOOKEEPER-1374

2) My panda won't run the Java core test suite through the completion; I'm guessing the same will hold true on the buildds so I've disabled execution on arm based architectures.

Builds OK on my panda locally.

To post a comment you must log in.
Revision history for this message
Clint Byrum (clint-fewbar) wrote :

Excerpts from James Page's message of Tue Jan 24 16:53:30 UTC 2012:
> James Page has proposed merging lp:~james-page/ubuntu/precise/zookeeper/arm-ftbfs-fixes into lp:ubuntu/zookeeper.
>
> Requested reviews:
> Clint Byrum (clint-fewbar)
> Related bugs:
> Bug #920871 in zookeeper (Ubuntu): "zookeeper 3.3.4+dfsg1-2ubuntu2 FTBFS on armel and armhf"
> https://bugs.launchpad.net/ubuntu/+source/zookeeper/+bug/920871
>
> For more details, see:
> https://code.launchpad.net/~james-page/ubuntu/precise/zookeeper/arm-ftbfs-fixes/+merge/89940
>
> This MP addresses testing on armel/armhf:
>
> 1) The current upstream C test code is not compatible with arm; patched to use _sync_* primitives rather than ASM code for atomic operations in the test code. Reported upstream with patch submitted https://issues.apache.org/jira/browse/ZOOKEEPER-1374
>
> 2) My panda won't run the Java core test suite through the completion; I'm guessing the same will hold true on the buildds so I've disabled execution on arm based architectures.
>
> Builds OK on my panda locally.

This looks great, but I don't know that I'm qualified to evaluate it,
having almost no assembly or arm porting experience.

+1, but with the disclaimer that I'm not sure at all why it works. :)

Revision history for this message
Matthias Klose (doko) wrote :

looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: