Mir

Merge lp://qastaging/~kdub/mir/fix-1239577 into lp://qastaging/mir

  1. fix-1239577
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Merged
Approved by: Kevin DuBois
Approved revision: no longer in the source branch.
Merged at revision: 1142
Proposed branch: lp://qastaging/~kdub/mir/fix-1239577
Merge into: lp://qastaging/mir
Diff against target: 1010 lines (+211/-450)
10 files modified
include/test/mir_test/draw/android_graphics.h (+0/-2)
include/test/mir_test/draw/draw_pattern_checkered-inl.h (+12/-12)
include/test/mir_test/draw/patterns.h (+6/-6)
include/test/mir_test/stub_server_tool.h (+2/-1)
tests/draw/android_graphics.cpp (+0/-6)
tests/draw/patterns.cpp (+12/-12)
tests/integration-tests/client/test_client_render.cpp (+154/-385)
tests/integration-tests/graphics/android/test_buffer_integration.cpp (+2/-2)
tests/integration-tests/graphics/android/test_display_integration.cpp (+0/-3)
tests/unit-tests/draw/test_draw_patterns.cpp (+23/-21)
To merge this branch: bzr merge lp://qastaging/~kdub/mir/fix-1239577
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Review via email: mp+191049@code.qastaging.launchpad.net

Commit message

fix: lp 1239577

TestClientIPCRender (an android-only gfx driver test) was hanging due to changes in signal handling. refactor the test, changing the cross-process sync mechanism so it doesn't use sigcont.

Description of the change

fix: lp 1239577

TestClientIPCRender (an android-only gfx driver test) was hanging due to changes in signal handling. refactor the test, changing the cross-process sync mechanism so it doesn't use sigcont.

this test was messy to begin with. It now passes reliably, and is cleaner after the refactor, although I'll admit there still is room to improve it.

also, I rm-ed the fragile check this test was doing for surfaceflinger. Now that mir is on the system images, it would compete for resources with unity8 (and detecting the running processes from /proc is fragile anyways). Just better to remove

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1134
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2354
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2239/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/161/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/164/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1135
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2243
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/162/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/165/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

1. I would have recommended keeping share_ptr's as regular pointers at least, to keep the diff down. But not important now that it's done.

2. This should have been an if statement: switch (i % 2)

3. Using braces{
    like this}; // is a minor style violation, I think

4. CI is showing some test failures on amd64 (see above).

I'm seeing some other newish failures, but they're on development-branch too (!?)

What's important though is bug 1239577 and that indeed seems to be fixed. Only bug 1239955 is holding up integration-tests on Nexus 4 now.

So #4 needs fixing. But otherwise approved.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1138
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2282
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/183/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/186/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1139
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/184
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/184/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/187/rebuild

review: Approve (continuous-integration)

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