Mir

Merge lp://qastaging/~afrantzis/mir/fix-1520217 into lp://qastaging/mir

  1. fix-1520217
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alberto Aguirre
Approved revision: no longer in the source branch.
Merged at revision: 3159
Proposed branch: lp://qastaging/~afrantzis/mir/fix-1520217
Merge into: lp://qastaging/mir
Diff against target: 134 lines (+30/-20)
2 files modified
include/test/mir_test_framework/server_runner.h (+6/-4)
tests/mir_test_framework/server_runner.cpp (+24/-16)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/fix-1520217
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alberto Aguirre (community) Approve
Alan Griffiths Approve
Review via email: mp+278852@code.qastaging.launchpad.net

Commit message

tests: Ensure mtf::ServerRunner::stop() can be invoked safely even when the server has been destroyed

Description of the change

tests: Ensure mtf::ServerRunner::stop() can be invoked safely even when the server has been destroyed

Although it's not the normal flow, there seem to be some cases where ServerRunner::stop() is called while/after the server is destroyed or the server is destroyed while calling stop(). The current code doesn't deal with this case properly since stop() will try to access a destroyed object.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Looks sensible. Would be nice to have evidence that this fixes our problem.

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

FAILED: Continuous integration, rev:3137
http://jenkins.qa.ubuntu.com/job/mir-ci/5704/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5079/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3985/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5026/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/34/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5026/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

^--- libstdc++ 4.9 does not implement atomic_store/load for shared_ptr.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Still looks sensible (but less elegant).

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

FAILED: Continuous integration, rev:3138
http://jenkins.qa.ubuntu.com/job/mir-ci/5714/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5099
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4005
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5047/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5047
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5047/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7582/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25622

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

The cause of the CI failure (which is uncovered by this MP) has been fixed in trunk. Retriggering CI.

Revision history for this message
Alberto Aguirre (albaguirre) wrote :

LGTM.

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

PASSED: Continuous integration, rev:3138
http://jenkins.qa.ubuntu.com/job/mir-ci/5733/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5078
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/68/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5078
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5078/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7609
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25676
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/66/console

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5087
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/38
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5087
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5087/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7617
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25691

review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote :
Download full text (3.6 KiB)

"[ 64%] Building CXX object tests/unit-tests/CMakeFiles/mir_unit_tests.dir/test_raii.cpp.o
cd /tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/obj-x86_64-linux-gnu/tests/unit-tests && /usr/bin/x86_64-linux-gnu-g++ -DLOG_NDEBUG=1 -DMESA_EGL_NO_X11_HEADERS -DMESA_KMS -DMIR_BUILD_PLATFORM_ANDROID -DMIR_BUILD_PLATFORM_MESA_KMS -DMIR_BUILD_PLATFORM_MESA_X11 -DMIR_CLIENT_PLATFORM_VERSION=\"MIR_CLIENT_PLATFORM_3\" -DMIR_VERSION_MAJOR=0 -DMIR_VERSION_MICRO=0 -DMIR_VERSION_MINOR=18 -DTEST_RECORDINGS_DIR=\"/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/tests/unit-tests/input_recordings/\" -DTYPO_SUPPORTS_FREETYPE -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC -Wno-error=overloaded-virtual -Dregister= -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/common -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/cookie -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/obj-x86_64-linux-gnu/src/protobuf -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-deps -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/frameworks/base/services/input -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/frameworks/base/include -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/frameworks/native/include -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/hardware/libhardware_legacy/include -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/system/core/include -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/system/extras/ext4_utils -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/external/kernel-headers -isystem /usr/include/android -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/platform -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/server -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/client -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/test -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/include/renderers/gl -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/tests/include -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38 -I/usr/include/libdrm -I/usr/include/umockdev-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/include/platform -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/include/server -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/include/client -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/include/common -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/include/gl -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/platforms/common/client -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/src/platforms/mesa/server/common -I/tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/playground/demo-shell/typo -I/usr/include/freetype2 -include /tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/obj-x86_64-linux-gnu/tests/unit-tests/mir_unit_tests_precompiled.hpp -Winvalid-pch -include /tmp/buildd/mir-0.18.0bzr3139pkg0xenial38/3rd_party/android-input/android/system/core/include/arch/ubuntu-x86/AndroidConfig.h -Wno-f...

Read more...

Revision history for this message
PS Jenkins bot (ps-jenkins) :
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