Mir

Merge lp:~vanvugt/mir/remove-workaround-1391261 into lp:mir

  1. remove-workaround-1391261
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3078
Proposed branch: lp:~vanvugt/mir/remove-workaround-1391261
Merge into: lp:mir
Diff against target: 18 lines (+0/-9)
1 file modified
tests/performance-tests/test_glmark2-es2-mir.cpp (+0/-9)
To merge this branch: bzr merge lp:~vanvugt/mir/remove-workaround-1391261
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Kevin DuBois (community) Approve
Alan Griffiths Needs Information
Review via email: mp+276081@code.launchpad.net

Commit message

Remove the workaround for CI issue LP: #1391261.

I believe we have fixed it properly now, by r2117 (LP: #1379685)
plus r2882 (LP: #1441553).

We need this test back in full form to catch any issues with the
new buffer scheme as it lands.

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

PASSED: Continuous integration, rev:3059
http://jenkins.qa.ubuntu.com/job/mir-ci/5431/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4627
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/585/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1585
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/585
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/585/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4628
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7248
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24674
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/586/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5431/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

Do we need some more CI passes before landing?

review: Needs Information
Revision history for this message
Kevin DuBois (kdub) wrote :

I guess we could still get this issue if we overallocate to 5 (rare), and we're still probably affected by lp: #1369763 if we were actually collecting numbers. AFAIK, we're not collecting numbers at the moment from this test suite, so I don't mind. Would be nice to see the CI turning back green from the krillin problems though before tinkering with it.

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

FAILED: Continuous integration, rev:3060
http://jenkins.qa.ubuntu.com/job/mir-ci/5452/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3623
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4658/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/616/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1606
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/616
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4659
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4659/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7272/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24720
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/617/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5452/rebuild

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

FAILED: Continuous integration, rev:3061
http://jenkins.qa.ubuntu.com/job/mir-ci/5465/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3636
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4671/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/629/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1619
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/629
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/629/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4672
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4672/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7284/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24779
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/630/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5465/rebuild

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

PASSED: Continuous integration, rev:3062
http://jenkins.qa.ubuntu.com/job/mir-ci/5482/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4690
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/648/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1636
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1636/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/648
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4691
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4691/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7303
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24829
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/649/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5482/rebuild

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

CI seems happy now.

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

PASSED: Continuous integration, rev:3063
http://jenkins.qa.ubuntu.com/job/mir-ci/5495/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4712
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/670/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1649
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1649/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/670
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/670/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4713
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7319
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24864
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/671/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5495/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/performance-tests/test_glmark2-es2-mir.cpp'
2--- tests/performance-tests/test_glmark2-es2-mir.cpp 2015-06-25 03:00:08 +0000
3+++ tests/performance-tests/test_glmark2-es2-mir.cpp 2015-11-04 02:25:59 +0000
4@@ -18,15 +18,6 @@
5 {
6 void SetUp() override
7 {
8-#ifdef ANDROID
9- /*
10- * Workaround instability that causes freezes when combining
11- * Android overlays with high-speed frame dropping (LP: #1391261).
12- * Fortunately glmark2 is the only use case that exploits this issue
13- * right now.
14- */
15- add_to_environment("MIR_SERVER_DISABLE_OVERLAYS", "true");
16-#endif
17 start_server();
18 }
19

Subscribers

People subscribed via source and target branches