Merge lp:~vanvugt/mir/fix-1358625 into lp:mir

[Daniel van Vugt]

Fix build failure: "variable ‘rc’ set but not used" which happens in
release mode (NDEBUG is set). (LP: #1358625)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1852
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2434/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1384
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1361/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/956
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/956/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/957
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/957/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/298
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/298/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2442/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11714

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2434/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

[libprotobuf ERROR google/protobuf/descriptor_database.cc:57] File already exists in database: mir_protobuf_wire.proto
[libprotobuf FATAL google/protobuf/descriptor.cc:954] CHECK failed: generated_database_->Add(encoded_file_descriptor, size):
terminate called after throwing an instance of 'google::protobuf::FatalException'
what(): CHECK failed: generated_database_->Add(encoded_file_descriptor, size):
Aborted (core dumped)

lp:1358698

~~~~

I'm not convinced that this is the best approach - looking at the example code I think the right answer could be:

#undef NDEBUG
#include <assert.h>

there is no error handling.

review: Abstain

[Daniel van Vugt (vanvugt)]

Alan,
You make a good point. The absence of error handling with NDEBUG will just lead to more cryptic crashes. I'll fix as suggested.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1853
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2441/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1395
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1372/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/963
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/963/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/964
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/309
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/309/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2452/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11781

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2441/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1855
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1005
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1005/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/358
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/358/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2498
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12009

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2483/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

=== modified file 'examples/scroll.cpp'
--- examples/scroll.cpp	2014-03-26 05:48:59 +0000
+++ examples/scroll.cpp	2014-08-25 03:12:36 +0000
@@ -19,6 +19,10 @@
 #include "mir_toolkit/mir_client_library.h"
 #include "graphics.h"
 
+#ifdef NDEBUG
+// We have no error handling so rely on assert() always being present.
+#undef NDEBUG
+#endif
 #include <assert.h>
 #include <signal.h>
 #include <string.h>