From 2ca1d7b16791856798995b4b8498dd148a0d12ab Mon Sep 17 00:00:00 2001 From: Pierre Wielders Date: Thu, 10 Aug 2023 06:32:19 +0200 Subject: [PATCH 1/2] [INTERFACES] New interfaces defintion, so align.. (#745) --- Svalbard/CryptographyRPC.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Svalbard/CryptographyRPC.cpp b/Svalbard/CryptographyRPC.cpp index 9830b09b2..9b8a298ad 100644 --- a/Svalbard/CryptographyRPC.cpp +++ b/Svalbard/CryptographyRPC.cpp @@ -113,7 +113,7 @@ namespace Plugin { config.FromString(framework->ConfigLine()); - _cryptography = Cryptography::ICryptography::Instance(""); + _cryptography = Exchange::ICryptography::Instance(""); Core::ProxyType server = Core::ProxyType::Create(&Core::IWorkerPool::Instance()); @@ -136,11 +136,11 @@ namespace Plugin { BEGIN_INTERFACE_MAP(CryptographyImplementation) INTERFACE_ENTRY(Exchange::IConfiguration) - INTERFACE_AGGREGATE(Cryptography::ICryptography, _cryptography) + INTERFACE_AGGREGATE(Exchange::ICryptography, _cryptography) END_INTERFACE_MAP private: - Cryptography::ICryptography* _cryptography; + Exchange::ICryptography* _cryptography; ExternalAccess* _rpcLink; }; From e33b589f58161741f1af26b8641e9512a5d50823 Mon Sep 17 00:00:00 2001 From: HaseenaSainul <41037131+HaseenaSainul@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:55:47 +0530 Subject: [PATCH 2/2] compositor: make test configurable (#746) --- Compositor/test/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Compositor/test/CMakeLists.txt b/Compositor/test/CMakeLists.txt index 2b76947be..2e47ae0ef 100644 --- a/Compositor/test/CMakeLists.txt +++ b/Compositor/test/CMakeLists.txt @@ -15,5 +15,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -add_subdirectory(compositortest) +option(BUILD_COMPOSITOR_TEST_CLIENT "Build compositor test client" OFF) +option(BUILD_COMPOSITOR_TEST_SERVER "Build compositor test server" OFF) + +if (BUILD_COMPOSITOR_TEST_CLIENT) + add_subdirectory(compositortest) +endif() +if (BUILD_COMPOSITOR_TEST_SERVER) add_subdirectory(compositorserver) +endif() + +