Merge lp:~alan-griffiths/mir/fix-1611337 into lp:mir

[Alan Griffiths]

Avoid potential use of an unspecified state when testing with the stub graphics platform (LP: #1611337)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3637
https://mir-jenkins.ubuntu.com/job/mir-ci/1416/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1727
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1780
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1751
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1751/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1751
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1751/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1751
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/1751/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/1751
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1751/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/1751
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1751/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1751
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/1751/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

OK

review: Approve

=== modified file 'tests/mir_test_framework/stubbed_graphics_platform.cpp'
--- tests/mir_test_framework/stubbed_graphics_platform.cpp	2016-08-01 09:37:45 +0000
+++ tests/mir_test_framework/stubbed_graphics_platform.cpp	2016-08-09 11:47:49 +0000
@@ -302,7 +302,11 @@
     std::shared_ptr<mg::GLConfig> const&)
 {
     if (display_preset)
-        return mir::make_module_ptr<WrappingDisplay>(std::move(display_preset));
+    {
+        decltype(display_preset) temp;
+        swap(temp, display_preset);
+        return mir::make_module_ptr<WrappingDisplay>(temp);
+    }
 
     return mir::make_module_ptr<mtd::StubDisplay>(display_rects);
 }