Mir

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

  1. fix-1472911
  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: 2736
Proposed branch: lp:~vanvugt/mir/fix-1472911
Merge into: lp:mir
Diff against target: 10 lines (+1/-1)
1 file modified
tests/mir_test_framework/main.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1472911
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Alexandros Frantzis (community) Approve
Review via email: mp+264235@code.launchpad.net

Commit message

mir_unit_tests et al: Don't blindly return success every time. Instead
return the actual test result in your return code back to ctest.
(LP: #1472911)

Description of the change

The default return value of an int function is always zero (success). Although I thought we were using sufficient compiler options for mistakes like this to be detected.... ?

To post a comment you must log in.
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

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

PASSED: Continuous integration, rev:2734
http://jenkins.qa.ubuntu.com/job/mir-ci/4288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/437
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/437/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3067
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5873
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21745

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

review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

I would have thought the compiler would have complained too... regardless, lgtm too

review: Approve
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/1640/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3123
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/645/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/193
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3071
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3071/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5877
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21758

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

PASSED: Continuous integration, rev:2735
http://jenkins.qa.ubuntu.com/job/mir-ci/4299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/448
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3080
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3080/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5885
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21774

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4299/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/mir_test_framework/main.cpp'
2--- tests/mir_test_framework/main.cpp 2015-06-25 15:47:46 +0000
3+++ tests/mir_test_framework/main.cpp 2015-07-10 03:30:46 +0000
4@@ -26,5 +26,5 @@
5 // Override this standard gtest message
6 std::cout << "Running main() from " << basename(__FILE__) << std::endl;
7
8- mir_test_framework::main(argc, argv);
9+ return mir_test_framework::main(argc, argv);
10 }

Subscribers

People subscribed via source and target branches