Merge lp://staging/~jpakkane/url-dispatcher/cleanups into lp://staging/url-dispatcher/15.04
Proposed by
Jussi Pakkanen
Status: | Merged |
---|---|
Approved by: | Ted Gould |
Approved revision: | 82 |
Merged at revision: | 75 |
Proposed branch: | lp://staging/~jpakkane/url-dispatcher/cleanups |
Merge into: | lp://staging/url-dispatcher/15.04 |
Diff against target: |
1475 lines (+271/-228) 20 files modified
.bzrignore (+4/-0) CMakeLists.txt (+25/-1) liburl-dispatcher/url-dispatcher.c (+1/-1) liburl-dispatcher/url-dispatcher.h (+3/-3) service/create-db-sql.h (+1/-0) service/dispatcher.c (+1/-1) service/dispatcher.h (+4/-4) service/update-directory.c (+1/-1) service/url-db.c (+0/-1) service/url-db.h (+4/-4) tests/CMakeLists.txt (+3/-13) tests/app-id-test.cc (+41/-40) tests/directory-update-test.cc (+43/-41) tests/dispatcher-test.cc (+26/-23) tests/lib-test.cc (+21/-20) tests/service-test.cc (+44/-41) tests/test-config.h.in (+11/-0) tests/ubuntu-app-launch-mock.h (+4/-4) tests/url-db-test.cc (+26/-24) tests/url_dispatcher_testability/CMakeLists.txt (+8/-6) |
To merge this branch: | bzr merge lp://staging/~jpakkane/url-dispatcher/cleanups |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+239871@code.staging.launchpad.net |
This proposal supersedes a proposal from 2014-10-28.
Commit message
General cleanups
Description of the change
This MR gathers a bunch of cleanups that should not affect functionality in any way but are needed for further work:
- use nullptr in C++
- enable warnings on C++
- fix include guards
- put all generated code in build directory
- add -Wpedantic for debug builds (it can't be on during merge as gdbus is not -Wpedantic clean)
- fix issues raised by various code inspection tools
- made -Werror togglable and defaulted it to off on debug builds
To post a comment you must log in.
FAILED: Continuous integration, rev:81 jenkins. qa.ubuntu. com/job/ url-dispatcher- ci/150/ jenkins. qa.ubuntu. com/job/ url-dispatcher- utopic- amd64-ci/ 44/console jenkins. qa.ubuntu. com/job/ url-dispatcher- utopic- armhf-ci/ 42/console jenkins. qa.ubuntu. com/job/ url-dispatcher- utopic- i386-ci/ 42/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/url- dispatcher- ci/150/ rebuild
http://