Mir

Merge lp://staging/~vanvugt/mir/fix-1583970 into lp://staging/mir

  1. fix-1583970
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 3518
Proposed branch: lp://staging/~vanvugt/mir/fix-1583970
Merge into: lp://staging/mir
Diff against target: 12 lines (+1/-1)
1 file modified
tests/acceptance-tests/test_client_logging.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~vanvugt/mir/fix-1583970
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve
Mir CI Bot continuous-integration Needs Fixing
Alan Griffiths Approve
Review via email: mp+295294@code.staging.launchpad.net

Commit message

Fix CI failure LP: #1583970 while also maintaining regression testing
for LP: #1581368, and support for running on slow CI systems.

Compositor "lag" was never terribly useful and all we need for regression
testing that right now is to check it's above zero.

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3514
https://mir-jenkins.ubuntu.com/job/mir-ci/1006/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1096
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1144
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1135
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1135
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1106
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1106/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1106
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1106/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1106
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1106/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1106
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1106/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1106
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1106/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1006/rebuild

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

OK

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/277/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1100/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/299/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1148
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1139
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1139
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1110/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1110/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1110/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1110/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1110
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1110/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

ok

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

The failure is seemingly unrelated to this branch...

13:08:37 /��BUILDDIR��/mir-0.23.0+vivid1139bzr3514/src/server/report/lttng/compositor_report.cpp:30:1: error: use of GNU statement expression extension [-Werror,-Wgnu-statement-expression]
13:08:37 COMPOSITOR_TRACE_CALL(started)
13:08:37 ^
13:08:37 /��BUILDDIR��/mir-0.23.0+vivid1139bzr3514/src/server/report/lttng/compositor_report.cpp:28:37: note: expanded from macro 'COMPOSITOR_TRACE_CALL'
13:08:37 #define COMPOSITOR_TRACE_CALL(name) MIR_LTTNG_VOID_TRACE_CALL(CompositorReport, mir_server_compositor, name)
13:08:37 ^
13:08:37 /��BUILDDIR��/mir-0.23.0+vivid1139bzr3514/src/server/report/lttng/lttng_utils.h:28:9: note: expanded from macro 'MIR_LTTNG_VOID_TRACE_CALL'
13:08:37 mir_tracepoint(comp, name, 0); \
13:08:37 ^

----

13:13:56 /usr/bin/cmake -E cmake_progress_report /��BUILDDIR��/mir-0.23.0+vivid1139bzr3514/obj-arm-linux-gnueabihf/CMakeFiles
13:13:56 ../../../../../src/server/report/lttng/compositor_report.cpp: In member function 'virtual void mir::report::lttng::CompositorReport::started()':
13:13:56 ../../../../../src/server/report/lttng/compositor_report.cpp:30:87: error: ISO C++ forbids braced-groups within expressions [-Werror=pedantic]
13:13:56 COMPOSITOR_TRACE_CALL(started)
13:13:56 ^
13:13:56 ../../../../../src/server/report/lttng/compositor_report.cpp: In member function 'virtual void mir::report::lttng::CompositorReport::stopped()':
13:13:56 ../../../../../src/server/report/lttng/compositor_report.cpp:31:87: error: ISO C++ forbids braced-groups within expressions [-Werror=pedantic]
13:13:56 COMPOSITOR_TRACE_CALL(stopped)
13:13:56

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

--> bug 1584601

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