Merge lp:~phablet-team/trust-store/mir-deprecations into lp:trust-store

[Cemil Azizoglu]

Updated to eliminate the Mir deprecations.

Updated to eliminate the Mir deprecations.

The legacy entry points will soon be removed from Mir.

[lp:~phablet-team/trust-store/mir-deprecations]

166. By Cemil Azizoglu on 2017-02-20

Require mirclient 0.26.1

[Alberto Aguirre (albaguirre)]

LGTM,

Nit, "constexpr const" is redundant in this case.

review: Approve

[lp:~phablet-team/trust-store/mir-deprecations]

167. By Brandon Schaefer on 2017-04-04

* Fix up for zesty

168. By Brandon Schaefer on 2017-04-05

* Opps wrong files

Unmerged revisions

168. By Brandon Schaefer on 2017-04-05

* Opps wrong files

167. By Brandon Schaefer on 2017-04-04

* Fix up for zesty

166. By Cemil Azizoglu on 2017-02-20

Require mirclient 0.26.1

165. By Cemil Azizoglu on 2017-02-17

Updated to do away with Mir 0.26.1 deprecations.

=== modified file 'debian/control.in'
--- debian/control.in	2016-03-24 18:14:51 +0000
+++ debian/control.in	2017-04-05 02:45:31 +0000
@@ -2,6 +2,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
+               cmake-extras,
                debhelper (>= 9),
                doxygen,
                google-mock,
@@ -18,7 +19,7 @@
                libgoogle-glog-dev,
                libgtest-dev,
                libjson-c-dev,
-               libmirclient-dev [amd64 arm64 i386 armhf],
+               libmirclient-dev (>= 0.26.1) [amd64 arm64 i386 armhf],
                libprocess-cpp-dev,
                libsqlite3-dev,
                lsb-release,

=== modified file 'src/core/trust/mir/agent.cpp'
--- src/core/trust/mir/agent.cpp	2015-12-11 08:58:11 +0000
+++ src/core/trust/mir/agent.cpp	2017-04-05 02:45:31 +0000
@@ -38,27 +38,6 @@
     return lhs.icon == rhs.icon && lhs.id == rhs.id && lhs.name == rhs.name;
 }
 
-// Invoked whenever a request for creation of pre-authenticated fds succeeds.
-void mir::PromptSessionVirtualTable::mir_client_fd_callback(MirPromptSession */*prompt_session*/, size_t count, int const* fds, void* context)
-{
-    if (count == 0)
-        return;
-
-    auto ctxt = static_cast<mir::PromptSessionVirtualTable::Context*>(context);
-
-    if (not ctxt)
-        return;
-
-    ctxt->fd = fds[0];
-
-    // Upstart enables FD_CLOEXEC by default. We have to counteract.
-    if (::fcntl(ctxt->fd, F_SETFD, 0) == -1) throw std::system_error
-    {
-        errno,
-        std::system_category()
-    };
-}
-
 mir::PromptSessionVirtualTable::PromptSessionVirtualTable(MirPromptSession* prompt_session)
     : prompt_session(prompt_session)
 {
@@ -76,21 +55,28 @@
 int mir::PromptSessionVirtualTable::new_fd_for_prompt_provider()
 {
     static const unsigned int fd_count = 1;
-
-    mir::PromptSessionVirtualTable::Context context;
-
-    mir_wait_for(mir_prompt_session_new_fds_for_prompt_providers(
-                     prompt_session,
-                     fd_count,
-                     PromptSessionVirtualTable::mir_client_fd_callback,
-                     &context));
-
-    if (context.fd == Context::invalid_fd) throw std::runtime_error
+    // Marks the value of an invalid fd.
+    static constexpr const int invalid_fd{-1};
+    int fd;
+
+    mir_prompt_session_new_fds_for_prompt_providers_sync(
+        prompt_session,
+        fd_count,
+        &fd);
+
+    if (fd == invalid_fd) throw std::runtime_error
     {
         "Could not acquire pre-authenticated file descriptors for Mir prompt session."
     };
 
-    return context.fd;
+    // Upstart enables FD_CLOEXEC by default. We have to counteract.
+    if (::fcntl(fd, F_SETFD, 0) == -1) throw std::system_error
+    {
+        errno,
+        std::system_category()
+    };
+
+    return fd;
 }
 
 void mir::PromptSessionVirtualTable::release_sync()
@@ -116,7 +102,7 @@
         // The process id of the requesting app/service
         core::trust::Pid app_pid,
         // Callback handling prompt session state changes.
-        mir_prompt_session_state_change_callback cb,
+        MirPromptSessionStateChangeCallback cb,
         // Callback context
         void* context)
 {

=== modified file 'src/core/trust/mir/agent.h'
--- src/core/trust/mir/agent.h	2015-11-26 15:25:34 +0000
+++ src/core/trust/mir/agent.h	2017-04-05 02:45:31 +0000
@@ -58,18 +58,6 @@
     // Just a convenience typedef
     typedef std::shared_ptr<PromptSessionVirtualTable> Ptr;
 
-    // Just a helper struct to be passed to client_fd_callbacks.
-    struct Context
-    {
-        // Marks the value of an invalid fd.
-        static constexpr const int invalid_fd{-1};
-        // The fd contained within this context instance.
-        int fd{invalid_fd};
-    };
-
-    // Invoked whenever a request for creation of pre-authenticated fds succeeds.
-    static void mir_client_fd_callback(MirPromptSession */*prompt_session*/, size_t count, int const* fds, void* context);
-
     // Create a MirPromptSessionVirtualTable for a given prompt session instance.
     // Please note that no change of ownwership is happening here. Instead, we expect
     // the calling code to handle object lifetimes.
@@ -111,7 +99,7 @@
             // The process id of the requesting app/service
             Pid app_pid,
             // Callback handling prompt session state changes.
-            mir_prompt_session_state_change_callback cb,
+            MirPromptSessionStateChangeCallback cb,
             // Callback context
             void* context);
 protected:

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-01-11 09:51:51 +0000
+++ tests/CMakeLists.txt	2017-04-05 02:45:31 +0000
@@ -1,11 +1,6 @@
 include_directories(${CMAKE_BINARY_DIR}/src)
 
-# Build with system gmock and embedded gtest
-set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+find_package(GMock)
 
 pkg_check_modules(DBUS dbus-1)
 
@@ -13,12 +8,22 @@
 
 configure_file(test_data.h.in test_data.h @ONLY)
 
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-Wgnu-zero-variadic-macro-arguments HAS_W_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
+
+if (HAS_W_GNU_ZERO_VARIADIC_MACRO_ARGUMENTS)
+  # INSTANTIATE_TEST_CASE_P hits this like a slice of lemon wrapped around a large gold brick.
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments")
+else()
+  # GCC is a bit less flexible than clang and needs a bigger hammer...
+  # Work around the Google Test headers not being C++11 friendly (LP: #1658604)
+  string(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+endif()
+
 include_directories(
   ${CMAKE_SOURCE_DIR}/src
 
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${GMOCK_INCLUDE_DIR}
-  ${GTEST_INCLUDE_DIR}
   ${PROCESS_CPP_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
 )
@@ -91,10 +96,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
 )
 
 target_link_libraries(
@@ -102,10 +105,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
 )
 
 target_link_libraries(
@@ -113,11 +114,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -126,11 +124,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -139,11 +134,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -152,11 +144,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -165,11 +154,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -178,11 +164,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -192,11 +175,8 @@
 
   trust-store
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -206,11 +186,8 @@
   trust-store
   trust-stored
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -220,11 +197,8 @@
   trust-store
   trust-stored
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -233,11 +207,8 @@
 
   trust-store-preseed-helper
 
-  gmock
-
-  gtest
-  gtest_main
-
+  ${GMOCK_LIBRARIES}
+  ${GTEST_BOTH_LIBRARIES}
   ${PROCESS_CPP_LIBRARIES}
 )
 
@@ -277,11 +248,8 @@
     trust-store
     xdg
 
-    gmock
-
-    gtest
-    gtest_main
-
+    ${GMOCK_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES}
     ${PROCESS_CPP_LIBRARIES}
   )
 
@@ -290,11 +258,8 @@
 
     trust-store
 
-    gmock
-
-    gtest
-    gtest_main
-
+    ${GMOCK_LIBRARIES}
+    ${GTEST_BOTH_LIBRARIES}
     ${PROCESS_CPP_LIBRARIES}
   )
 

=== modified file 'tests/cached_agent_test.cpp'
--- tests/cached_agent_test.cpp	2014-08-19 14:11:30 +0000
+++ tests/cached_agent_test.cpp	2017-04-05 02:45:31 +0000
@@ -22,6 +22,8 @@
 #include "mock_store.h"
 #include "the.h"
 
+#include <random>
+
 namespace
 {
 struct MockReporter : public core::trust::CachedAgent::Reporter

=== modified file 'tests/mir_agent_test.cpp'
--- tests/mir_agent_test.cpp	2015-11-26 15:25:34 +0000
+++ tests/mir_agent_test.cpp	2017-04-05 02:45:31 +0000
@@ -66,7 +66,7 @@
                      // The process id of the requesting app/service
                      core::trust::Pid app_pid,
                      // Callback handling prompt session state changes.
-                     mir_prompt_session_state_change_callback,
+                     MirPromptSessionStateChangeCallback,
                      // Callback context
                      void*));
 };

=== modified file 'tests/remote_agent_test.cpp'
--- tests/remote_agent_test.cpp	2016-01-11 21:28:55 +0000
+++ tests/remote_agent_test.cpp	2017-04-05 02:45:31 +0000
@@ -34,6 +34,7 @@
 #include <gtest/gtest.h>
 
 #include <thread>
+#include <random>
 
 namespace
 {