trust-store

Merge lp:~thomas-voss/trust-store/explicit-gcc-version into lp:trust-store

  1. explicit-gcc-version
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 20
Merged at revision: 22
Proposed branch: lp:~thomas-voss/trust-store/explicit-gcc-version
Merge into: lp:trust-store
Diff against target: 117 lines (+27/-11)
6 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+6/-0)
debian/control (+7/-3)
debian/libtrust-store1.symbols (+1/-1)
debian/rules (+11/-0)
tests/request_processor_test.cpp (+0/-5)
To merge this branch: bzr merge lp:~thomas-voss/trust-store/explicit-gcc-version
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Colin Watson Approve
Matthias Klose Pending
Review via email: mp+224769@code.launchpad.net

Commit message

Bump major revision and so name to account for toolchain update.

Description of the change

Bump major revision and so name to account for toolchain update.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

I'd suggest versioning the build-dependencies on libdbus-cpp-dev and libprocess-cpp-dev, but otherwise fine.

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

FAILED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/trust-store-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/4/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/trust-store/explicit-gcc-version updated
18. By Thomas Voß

[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
[ thomas-voss ]
* Provide an agent implementation that leverages Mir's trusted
  prompting API. Introduce a default prompt provider using Qt/QML.
  Provide a test harness around the core::trust::mir::Agent
  implementation and the prompt provider. Add a convenience function
  for processing incoming requests.
[ thomas-voss ]
* Remove obsolete data/session.conf and data/system.conf files. Adjust
  directory creation default mode to 0755. (LP: #1338587)
[ Ubuntu daily release ]
* New rebuild forced

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

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/trust-store-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/17/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/trust-store/explicit-gcc-version updated
19. By Thomas Voß

Add versioned build-dep on dbus-cpp.

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

FAILED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/trust-store-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/18/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/trust-store/explicit-gcc-version updated
20. By Thomas Voß

Remove unused function.

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

FAILED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/trust-store-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/19/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-07-15 10:14:45 +0000
+++ CMakeLists.txt 2014-07-18 15:25:44 +0000
@@ -34,9 +34,9 @@
34pkg_check_modules(MIR_COMMON mircommon REQUIRED)34pkg_check_modules(MIR_COMMON mircommon REQUIRED)
35pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)35pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
3636
37set(TRUST_STORE_VERSION_MAJOR 0)37set(TRUST_STORE_VERSION_MAJOR 1)
38set(TRUST_STORE_VERSION_MINOR 0)38set(TRUST_STORE_VERSION_MINOR 0)
39set(TRUST_STORE_VERSION_PATCH 1)39set(TRUST_STORE_VERSION_PATCH 0)
4040
41include(CTest)41include(CTest)
4242
4343
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-17 18:45:56 +0000
+++ debian/changelog 2014-07-18 15:25:44 +0000
@@ -1,3 +1,9 @@
1trust-store (1.0.0) UNRELEASED; urgency=medium
2
3 * Bump major revision and so name to account for toolchain update.
4
5 -- Thomas Voß <thomas.voss@canonical.com> Fri, 27 Jun 2014 10:46:20 +0200
6
1trust-store (0.0.1+14.10.20140717.8-0ubuntu1) utopic; urgency=low7trust-store (0.0.1+14.10.20140717.8-0ubuntu1) utopic; urgency=low
28
3 [ Ubuntu daily release ]9 [ Ubuntu daily release ]
410
=== modified file 'debian/control'
--- debian/control 2014-07-17 18:40:43 +0000
+++ debian/control 2014-07-18 15:25:44 +0000
@@ -7,9 +7,13 @@
7 google-mock,7 google-mock,
8 gcovr,8 gcovr,
9 graphviz,9 graphviz,
10# We rely on C++11 features, and to prevent from ABI breaks
11# in libstdc++ causing us issues, we explicitly select a G++
12# version.
13 g++-4.9,
10 libboost-program-options-dev,14 libboost-program-options-dev,
11 libboost-system-dev,15 libboost-system-dev,
12 libdbus-cpp-dev,16 libdbus-cpp-dev (>= 4.0.0),
13 libdbus-1-dev,17 libdbus-1-dev,
14 libgtest-dev,18 libgtest-dev,
15 libjson-c-dev,19 libjson-c-dev,
@@ -29,7 +33,7 @@
29# upstream branch33# upstream branch
30Vcs-Bzr: lp:trust-store34Vcs-Bzr: lp:trust-store
3135
32Package: libtrust-store036Package: libtrust-store1
33Architecture: any37Architecture: any
34Multi-Arch: same38Multi-Arch: same
35Pre-Depends: ${misc:Pre-Depends},39Pre-Depends: ${misc:Pre-Depends},
@@ -47,7 +51,7 @@
47Multi-Arch: same51Multi-Arch: same
48Pre-Depends: ${misc:Pre-Depends},52Pre-Depends: ${misc:Pre-Depends},
49Recommends: libtrust-store-doc,53Recommends: libtrust-store-doc,
50Depends: libtrust-store0 (= ${binary:Version}),54Depends: libtrust-store1 (= ${binary:Version}),
51 ${misc:Depends},55 ${misc:Depends},
52Description: C++11 library for persisting trust requests - dev files56Description: C++11 library for persisting trust requests - dev files
53 Provides a common implementation of a trust store to be used by trusted57 Provides a common implementation of a trust store to be used by trusted
5458
=== renamed file 'debian/libtrust-store0.install' => 'debian/libtrust-store1.install'
=== renamed file 'debian/libtrust-store0.symbols' => 'debian/libtrust-store1.symbols'
--- debian/libtrust-store0.symbols 2014-07-17 18:45:52 +0000
+++ debian/libtrust-store1.symbols 2014-07-18 15:25:44 +0000
@@ -1,4 +1,4 @@
1libtrust-store.so.0 libtrust-store0 #MINVER#1libtrust-store.so.1 libtrust-store1 #MINVER#
2 (c++)"core::trust::create_default_store(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.12 (c++)"core::trust::create_default_store(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
3 (c++)"core::trust::process_trust_request(core::trust::RequestParameters const&)@Base" 0.0.1+14.10.20140717.83 (c++)"core::trust::process_trust_request(core::trust::RequestParameters const&)@Base" 0.0.1+14.10.20140717.8
4 (c++)"core::trust::expose_store_to_bus_with_name(std::shared_ptr<core::trust::Store> const&, std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.14 (c++)"core::trust::expose_store_to_bus_with_name(std::shared_ptr<core::trust::Store> const&, std::shared_ptr<core::dbus::Bus> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.0.1+14.10.20140626.1
55
=== modified file 'debian/rules'
--- debian/rules 2014-06-26 08:10:37 +0000
+++ debian/rules 2014-07-18 15:25:44 +0000
@@ -2,8 +2,19 @@
2# -*- makefile -*-2# -*- makefile -*-
33
4export DPKG_GENSYMBOLS_CHECK_LEVEL=44export DPKG_GENSYMBOLS_CHECK_LEVEL=4
5
6include /usr/share/dpkg/default.mk
7
8# Explicitly selecting a G{CC,++}-version here to avoid accidental
9# ABI breaks introduced by toolchain updates.
10export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
11export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
12
5# The home directory of user buildd does not exist on the builders13# The home directory of user buildd does not exist on the builders
6export XDG_DATA_HOME=/tmp14export XDG_DATA_HOME=/tmp
715
8%:16%:
9 dh $@ --fail-missing17 dh $@ --fail-missing
18
19override_dh_auto_configure:
20 dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
1021
=== modified file 'tests/request_processor_test.cpp'
--- tests/request_processor_test.cpp 2014-07-14 16:05:37 +0000
+++ tests/request_processor_test.cpp 2014-07-18 15:25:44 +0000
@@ -118,11 +118,6 @@
118 return std::make_shared<testing::NiceMock<MockStore>>();118 return std::make_shared<testing::NiceMock<MockStore>>();
119}119}
120120
121std::shared_ptr<core::trust::Store::Query> a_null_query()
122{
123 return std::shared_ptr<core::trust::Store::Query>{};
124}
125
126std::shared_ptr<testing::NiceMock<MockStore::MockQuery>> a_mocked_query()121std::shared_ptr<testing::NiceMock<MockStore::MockQuery>> a_mocked_query()
127{122{
128 return std::make_shared<testing::NiceMock<MockStore::MockQuery>>();123 return std::make_shared<testing::NiceMock<MockStore::MockQuery>>();

Subscribers

People subscribed via source and target branches