location-service

Merge lp://staging/~thomas-voss/location-service/enable-dual-landing into lp://staging/location-service/trunk

  1. enable-dual-landing
  2. Merge into trunk
Proposed by Thomas Voß
Status: Needs review
Proposed branch: lp://staging/~thomas-voss/location-service/enable-dual-landing
Merge into: lp://staging/location-service/trunk
Diff against target: 2660 lines (+1851/-161)
48 files modified
CMakeLists.txt (+42/-3)
_clang-format (+56/-0)
astyle-config (+43/-0)
debian/VERSION (+1/-0)
debian/VERSION.vivid (+1/-0)
debian/changelog (+81/-0)
debian/control (+11/-5)
debian/control.in (+123/-0)
debian/gen-debian-files.sh (+111/-0)
debian/get-versions.sh (+68/-0)
debian/libubuntu-location-service-dev.install (+0/-5)
debian/libubuntu-location-service-dev.install.in (+5/-0)
debian/libubuntu-location-service.install.in (+2/-0)
debian/libubuntu-location-service.install.with-gps.in (+3/-0)
debian/libubuntu-location-service2.install (+0/-2)
debian/libubuntu-location-service2.install.with-gps (+0/-3)
debian/rules (+20/-1)
debian/source/format (+1/-1)
doc/Doxyfile.in (+2/-2)
doc/daemon_and_cli.md (+55/-0)
doc/debugging.md (+92/-0)
doc/hacking.md (+146/-0)
doc/intro.md (+67/-0)
doc/manual_testing.md (+174/-0)
doc/tips_n_tricks.md (+21/-0)
src/location_service/com/ubuntu/location/CMakeLists.txt (+1/-0)
src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp (+12/-6)
src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.h (+12/-0)
src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp (+1/-1)
src/location_service/com/ubuntu/location/engine.cpp (+23/-14)
src/location_service/com/ubuntu/location/engine.h (+3/-3)
src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp (+3/-5)
src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h (+1/-1)
src/location_service/com/ubuntu/location/service/daemon.cpp (+14/-66)
src/location_service/com/ubuntu/location/service/implementation.cpp (+23/-4)
src/location_service/com/ubuntu/location/service/provider_daemon.cpp (+17/-16)
src/location_service/com/ubuntu/location/service/runtime.cpp (+109/-0)
src/location_service/com/ubuntu/location/service/runtime.h (+90/-0)
src/location_service/com/ubuntu/location/service/session/skeleton.cpp (+21/-3)
src/location_service/com/ubuntu/location/time_based_update_policy.cpp (+4/-3)
tests/CMakeLists.txt (+1/-0)
tests/acceptance_tests.cpp (+115/-13)
tests/engine_test.cpp (+3/-3)
tests/gps_provider_test.cpp (+83/-0)
tests/position_test.cpp (+1/-1)
tests/runtime_test.cpp (+118/-0)
tools/CMakeLists.txt (+1/-0)
tools/symbol_diff.in (+70/-0)
To merge this branch: bzr merge lp://staging/~thomas-voss/location-service/enable-dual-landing
Reviewer Review Type Date Requested Status
Łukasz Zemczak packaging Needs Fixing
PS Jenkins bot continuous-integration Approve
Review via email: mp+282942@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-11-20.

Commit message

Enable dual landing.

Description of the change

Enable dual landing.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/location-service-ci/406/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/78/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/406/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:223
http://jenkins.qa.ubuntu.com/job/location-service-ci/407/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/79/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/407/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/location-service-ci/408/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/80/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/408/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/location-service-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/81
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/81/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/81

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/409/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/location-service-ci/410/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/82

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/410/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/location-service-ci/411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/83

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/411/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/location-service-ci/413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/413/rebuild

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

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/location-service-ci/416/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/416/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, that's one big branch. The control.in and rules bits seem to be ok. Yes, I'm getting boring here, but the thing that's missing is some ABI checking. This package never really seemed to have symbols so it's not a regression, but I would like that added ASAP. We can, of course, not block on this, but a bug with high priority would have to be filled in and assigned to someone to work on it before landing.

That being said... there are some strange things here. First of all: the merge commit-message (or changelog) needs updating to actually be more verbose on what happened here - how the dual landings are done etc. I also see a lot of other changes, probably not completely related in the silo. Those need to have a mention in the changelog/commit-message itself. Certainly "Enable dual landing." is not enough in this case.

Another strange thing: I noticed you have added the tools/symbol_diff.in tool, but that's not really used anywhere. Also, the documentation mentions symbols checking, but the packaging doesn't really provide any default symbols right now (this should be automated if anything). The same document (doc/hacking.md) also, when mentioning ABI compliance checker uses libunity-scopes in the examples, which seems strange.

review: Needs Fixing (packaging)
Reply

Unmerged revisions

228. By Thomas Voß

* Ensure that event connections are cleaned up on destruction. (LP:
  #1480877)
[ Alberto Mardegan ]
* Send last known position on session start
[ CI Train Bot ]
* New rebuild forced.
[ Thomas Voß ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
  pair of files. Add test cases around correct operation of
  service::Runtime. added:
  src/location_service/com/ubuntu/location/service/runtime.cpp
  src/location_service/com/ubuntu/location/service/runtime.h
  tests/runtime_test.cpp
[ thomas-voss ]
* Factor out service::Runtime from daemon.cpp into its own .h/.cpp
  pair of files. Add test cases around correct operation of
  service::Runtime. added:
  src/location_service/com/ubuntu/location/service/runtime.cpp
  src/location_service/com/ubuntu/location/service/runtime.h
  tests/runtime_test.cpp

227. By Thomas Voß

Provide a sensible version fallback.
Add correct version for Replaces/Conflicts stanzas in generated debian/control.

226. By Thomas Voß

Lower client count to make test more robust.

225. By Thomas Voß

Add build-dependency on lsb-release to debian/control.in.

224. By Thomas Voß

Fix s/lsp/lsb/ typo.

223. By Thomas Voß

* libubuntu-location-service3: Replaces libubuntu-location-service2,
  config file /etc/gps.conf in both packages.
* Bump major revision and fix LP:#1478750 to account for toolchain update.

222. By Thomas Voß

Add missing build-dep on lsb-release.

221. By Thomas Voß

Account for versioned include dir.

220. By Thomas Voß

Alter build setup to query major.minor.patch from debian.VERSION* files.

219. By Thomas Voß

Enable dual landing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches