unity-scopes-api

Merge lp://qastaging/~michihenning/unity-scopes-api/ditch-jsoncpp into lp://qastaging/unity-scopes-api/devel

  1. ditch-jsoncpp
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 668
Merged at revision: 673
Proposed branch: lp://qastaging/~michihenning/unity-scopes-api/ditch-jsoncpp
Merge into: lp://qastaging/unity-scopes-api/devel
Diff against target: 2049 lines (+1126/-423)
18 files modified
CMakeLists.txt (+3/-3)
debian/control.in (+1/-1)
include/unity/scopes/internal/JsonCppNode.h (+17/-10)
include/unity/scopes/internal/JsonNodeInterface.h (+2/-3)
include/unity/scopes/internal/JsonSettingsSchema.h (+1/-1)
include/unity/scopes/internal/gobj_memory.h (+212/-0)
src/scopes/internal/JsonCppNode.cpp (+279/-200)
src/scopes/internal/JsonSettingsSchema.cpp (+149/-162)
src/scopes/internal/Logger.cpp (+2/-2)
src/scopes/internal/zmq_middleware/StopPublisher.cpp (+1/-1)
src/scopes/testing/ScopeMetadataBuilder.cpp (+1/-3)
test/gtest/scopes/internal/CMakeLists.txt (+1/-0)
test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp (+146/-17)
test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp (+37/-5)
test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp (+4/-4)
test/gtest/scopes/internal/gobj_ptr/CMakeLists.txt (+3/-0)
test/gtest/scopes/internal/gobj_ptr/gobj_ptr_test.cpp (+208/-0)
test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp (+59/-11)
To merge this branch: bzr merge lp://qastaging/~michihenning/unity-scopes-api/ditch-jsoncpp
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+289006@code.qastaging.launchpad.net

Commit message

Removed libjson-cpp and replaced with json-glib based implementation.

Description of the change

Removed libjson-cpp and replaced with json-glib based implementation.

To post a comment you must log in.
lp://qastaging/~michihenning/unity-scopes-api/ditch-jsoncpp updated
667. By Michi Henning

Added gobj_ptr tests.

668. By Michi Henning

Removed stale #include.

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

FAILED: Continuous integration, rev:667
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1660/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-amd64-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-i386-ci/92/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1660/rebuild

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

PASSED: Continuous integration, rev:668
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1661/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-amd64-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/270
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-armhf-ci/270/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-vivid-i386-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-xenial-i386-ci/93

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1661/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

All looks good here (after an update + upgrade the warnings did indeed go away)

review: Approve

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

to all changes: