From 02bc39da4d7dcb31fef274216fa0cfce0597c9ad Mon Sep 17 00:00:00 2001 From: Nahid Farhady Ghalaty Date: Mon, 18 Nov 2024 19:54:14 -0800 Subject: [PATCH 1/3] update version to point to PG unfied schema --- lib/include/public/Version.hpp | 6 +++--- lib/modules | 2 +- tests/unittests/UnitTests.vcxproj | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp index 84d9b1f0a..377a59ffa 100644 --- a/lib/include/public/Version.hpp +++ b/lib/include/public/Version.hpp @@ -6,8 +6,8 @@ #define MAT_VERSION_HPP // WARNING: DO NOT MODIFY THIS FILE! // This file has been automatically generated, manual changes will be lost. -#define BUILD_VERSION_STR "3.8.249.1" -#define BUILD_VERSION 3,8,249,1 +#define BUILD_VERSION_STR "3.8.323.1" +#define BUILD_VERSION 3,8,323,1 #ifndef RESOURCE_COMPILER_INVOKED #include "ctmacros.hpp" @@ -18,7 +18,7 @@ namespace MAT_NS_BEGIN { uint64_t const Version = ((uint64_t)3 << 48) | ((uint64_t)8 << 32) | - ((uint64_t)249 << 16) | + ((uint64_t)323 << 16) | ((uint64_t)1); } MAT_NS_END diff --git a/lib/modules b/lib/modules index 1a97d3e55..8539da62d 160000 --- a/lib/modules +++ b/lib/modules @@ -1 +1 @@ -Subproject commit 1a97d3e5593e74806d7e7fcbd8c25ca77a3967d8 +Subproject commit 8539da62dd5e41e2847337df1d95f0f841d3a738 diff --git a/tests/unittests/UnitTests.vcxproj b/tests/unittests/UnitTests.vcxproj index dac3d0361..3355b1404 100644 --- a/tests/unittests/UnitTests.vcxproj +++ b/tests/unittests/UnitTests.vcxproj @@ -481,6 +481,9 @@ + + + From 8178b5cb76f397acc0a746e752a99c5be2b5950b Mon Sep 17 00:00:00 2001 From: Nahid Farhady Ghalaty Date: Mon, 18 Nov 2024 20:08:37 -0800 Subject: [PATCH 2/3] revert version --- lib/include/public/Version.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp index 377a59ffa..84d9b1f0a 100644 --- a/lib/include/public/Version.hpp +++ b/lib/include/public/Version.hpp @@ -6,8 +6,8 @@ #define MAT_VERSION_HPP // WARNING: DO NOT MODIFY THIS FILE! // This file has been automatically generated, manual changes will be lost. -#define BUILD_VERSION_STR "3.8.323.1" -#define BUILD_VERSION 3,8,323,1 +#define BUILD_VERSION_STR "3.8.249.1" +#define BUILD_VERSION 3,8,249,1 #ifndef RESOURCE_COMPILER_INVOKED #include "ctmacros.hpp" @@ -18,7 +18,7 @@ namespace MAT_NS_BEGIN { uint64_t const Version = ((uint64_t)3 << 48) | ((uint64_t)8 << 32) | - ((uint64_t)323 << 16) | + ((uint64_t)249 << 16) | ((uint64_t)1); } MAT_NS_END From c6124cf569d1124a9ffdfdcd758e3d373b02f550 Mon Sep 17 00:00:00 2001 From: Nahid Farhady Ghalaty Date: Mon, 18 Nov 2024 20:15:43 -0800 Subject: [PATCH 3/3] Add tests to unit tests set --- tests/unittests/CMakeLists.txt | 6 +++++- tests/unittests/UnitTests.vcxproj.filters | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt index d87184bbb..8edfca017 100644 --- a/tests/unittests/CMakeLists.txt +++ b/tests/unittests/CMakeLists.txt @@ -70,7 +70,11 @@ endif() if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/privacyguard/ AND BUILD_PRIVACYGUARD) add_definitions(-DHAVE_MAT_PRIVACYGUARD) list(APPEND SRCS - ${CMAKE_SOURCE_DIR}/lib/modules/privacyguard/tests/unittests/PrivacyGuardTests.cpp + ${CMAKE_SOURCE_DIR}/lib/modules/privacyguard/tests/unittests/InitializationConfigurationTests.cpp + ${CMAKE_SOURCE_DIR}/lib/modules/privacyguard/tests/unittests/PrivacyConcernEventTests.cpp + ${CMAKE_SOURCE_DIR}/lib/modules/privacyguard/tests/unittests/PrivacyConcernMetadataProviderTests.cpp + ${CMAKE_SOURCE_DIR}/lib/modules/privacyguard/tests/unittests/PrivacyGuardTests.cpp + ${CMAKE_SOURCE_DIR}/lib/modules/privacyguard/tests/unittests/SystematicSamplerTests.cpp ) endif() diff --git a/tests/unittests/UnitTests.vcxproj.filters b/tests/unittests/UnitTests.vcxproj.filters index 3de9d5881..86dbf15c4 100644 --- a/tests/unittests/UnitTests.vcxproj.filters +++ b/tests/unittests/UnitTests.vcxproj.filters @@ -56,7 +56,11 @@ + + + +