Unity8 PolicyKit Agent

Merge lp:~aacid/policykit-unity8/zesty_compile into lp:policykit-unity8

  1. zesty_compile
  2. Merge into 16.04
Proposed by Albert Astals Cid
Status: Merged
Approved by: Ted Gould
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~aacid/policykit-unity8/zesty_compile
Merge into: lp:policykit-unity8
Diff against target: 84 lines (+10/-4)
4 files modified
tests/CMakeLists.txt (+4/-4)
tests/agent-test.cpp (+2/-0)
tests/auth-manager-test.cpp (+2/-0)
tests/authentication-test.cpp (+2/-0)
To merge this branch: bzr merge lp:~aacid/policykit-unity8/zesty_compile
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+311956@code.launchpad.net

Commit message

Compile on zesty

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:17
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/10/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1197
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1204
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/990
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/990/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/990
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/990/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/990
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/990/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/990
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/990/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/990
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/990/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/990
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/990/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-policykit-unity8-ci/10/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2016-08-29 18:58:00 +0000
3+++ tests/CMakeLists.txt 2016-11-28 16:30:07 +0000
4@@ -13,7 +13,7 @@
5 set (GTEST_SOURCE_DIR /usr/src/gtest/src)
6 set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
7
8-add_subdirectory("/usr/src/gmock" gmock)
9+find_package(GMock)
10
11 include_directories(${GTEST_INCLUDE_DIR})
12
13@@ -34,7 +34,7 @@
14 )
15
16 target_link_libraries(agent-test
17- gmock_main
18+ ${GMOCK_LIBRARIES}
19 service-lib
20 ${DBUSTEST_LIBRARIES}
21 )
22@@ -58,7 +58,7 @@
23 )
24
25 target_link_libraries(auth-manager-test
26- gmock_main
27+ ${GMOCK_LIBRARIES}
28 service-lib
29 ${DBUSTEST_LIBRARIES}
30 )
31@@ -78,7 +78,7 @@
32 )
33
34 target_link_libraries(authentication-test
35- gmock_main
36+ ${GMOCK_LIBRARIES}
37 service-lib
38 ${DBUSTEST_LIBRARIES}
39 )
40
41=== modified file 'tests/agent-test.cpp'
42--- tests/agent-test.cpp 2016-08-29 18:58:00 +0000
43+++ tests/agent-test.cpp 2016-11-28 16:30:07 +0000
44@@ -18,8 +18,10 @@
45 */
46
47 /* Test Libraries */
48+#pragma GCC diagnostic ignored "-Wsign-compare"
49 #include <gmock/gmock.h>
50 #include <gtest/gtest.h>
51+#pragma GCC diagnostic pop
52 #include <libdbustest/dbus-test.h>
53
54 /* Mocks */
55
56=== modified file 'tests/auth-manager-test.cpp'
57--- tests/auth-manager-test.cpp 2016-08-22 22:01:02 +0000
58+++ tests/auth-manager-test.cpp 2016-11-28 16:30:07 +0000
59@@ -18,8 +18,10 @@
60 */
61
62 /* Test Libraries */
63+#pragma GCC diagnostic ignored "-Wsign-compare"
64 #include <gmock/gmock.h>
65 #include <gtest/gtest.h>
66+#pragma GCC diagnostic pop
67 #include <libdbustest/dbus-test.h>
68
69 /* Mocks */
70
71=== modified file 'tests/authentication-test.cpp'
72--- tests/authentication-test.cpp 2016-08-22 22:01:02 +0000
73+++ tests/authentication-test.cpp 2016-11-28 16:30:07 +0000
74@@ -18,8 +18,10 @@
75 */
76
77 /* Test Libraries */
78+#pragma GCC diagnostic ignored "-Wsign-compare"
79 #include <gmock/gmock.h>
80 #include <gtest/gtest.h>
81+#pragma GCC diagnostic pop
82 #include <libdbustest/dbus-test.h>
83
84 /* Mocks */

Subscribers

People subscribed via source and target branches