Merge lp:~alan-griffiths/mir/fix-command-line-handling into lp:mir
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | Alan Griffiths |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2090 |
Proposed branch: | lp:~alan-griffiths/mir/fix-command-line-handling |
Merge into: | lp:mir |
Diff against target: |
93 lines (+19/-13) 3 files modified
tests/include/mir_test_framework/command_line_server_configuration.h (+3/-0) tests/mir_test_framework/command_line_server_configuration.cpp (+13/-13) tests/mir_test_framework/headless_test.cpp (+3/-0) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/fix-command-line-handling |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cemil Azizoglu (community) | Approve | ||
Alberto Aguirre (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+242476@code.launchpad.net |
Commit message
tests: fix commandline handling in tests
Description of the change
tests: fix command line handling in tests
The replacement main() screwed up Mir options when there are also gtest options. That's fixed.
Also, the new test framework failed to set the command line for the Mir server
To post a comment you must log in.
PASSED: Continuous integration, rev:2087 jenkins. qa.ubuntu. com/job/ mir-ci/ 2204/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/270 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/270 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/244 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 193 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 193/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 244 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 244/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/3502 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 16098
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/2204/ rebuild
http://