You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2026/03/30 12:43:40 UTC
(nifi-minifi-cpp) 12/18: MINIFICPP-2715 - Windows fix
This is an automated email from the ASF dual-hosted git repository.
martinzink pushed a commit to branch controller_c_api_requirements
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 76a2658ee90fa95a590953d5f9aefc50eface17e
Author: Adam Debreceni <ad...@apache.org>
AuthorDate: Thu Mar 12 12:16:24 2026 +0100
MINIFICPP-2715 - Windows fix
---
.../test/integration/extension-verification-test/CMakeLists.txt | 6 +++---
.../extension-verification-test/ExtensionVerificationTests.cpp | 9 +++++++++
.../integration/extension-verification-test/dummy-cpp-api.def | 1 +
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/libminifi/test/integration/extension-verification-test/CMakeLists.txt b/libminifi/test/integration/extension-verification-test/CMakeLists.txt
index 4e2980609..2ef595e9b 100644
--- a/libminifi/test/integration/extension-verification-test/CMakeLists.txt
+++ b/libminifi/test/integration/extension-verification-test/CMakeLists.txt
@@ -19,7 +19,7 @@
add_minifi_executable(ExtensionVerificationTests ExtensionVerificationTests.cpp)
createIntegrationTests(ExtensionVerificationTests)
-target_link_libraries(${testfilename} core-minifi Catch2WithMain Threads::Threads)
+target_link_libraries(ExtensionVerificationTests core-minifi Catch2WithMain Threads::Threads)
add_test(NAME ExtensionVerificationTests COMMAND ExtensionVerificationTests)
function(create_loading_test_extension extension-name extension-main)
@@ -66,8 +66,8 @@ target_link_libraries(test-extension-loading-invalid-build-id-cpp dummy-core-min
target_compile_definitions(test-extension-loading-invalid-build-id-cpp PRIVATE MINIFI_CREATE_EXTENSION_FN=MinifiCreateCppExtension_NonMatchingBuildId)
create_loading_test_extension(test-extension-loading-valid-build-id-cpp CppApiExtension.cpp)
-target_link_libraries(test-extension-loading-valid-build-id-cpp minifi-c-api dummy-core-minifi)
-target_compile_definitions(test-extension-loading-valid-build-id-cpp PRIVATE MINIFI_CREATE_EXTENSION_FN=MinifiCreateCppExtension_${BUILD_IDENTIFIER})
+target_link_libraries(test-extension-loading-valid-build-id-cpp dummy-core-minifi)
+target_compile_definitions(test-extension-loading-valid-build-id-cpp PRIVATE MINIFI_CREATE_EXTENSION_FN=MinifiCreateCppExtension_MatchingBuildId)
create_c_test_extension(max-version 10)
create_c_test_extension(valid-version 7)
diff --git a/libminifi/test/integration/extension-verification-test/ExtensionVerificationTests.cpp b/libminifi/test/integration/extension-verification-test/ExtensionVerificationTests.cpp
index c0bec8b8c..86084f80d 100644
--- a/libminifi/test/integration/extension-verification-test/ExtensionVerificationTests.cpp
+++ b/libminifi/test/integration/extension-verification-test/ExtensionVerificationTests.cpp
@@ -18,12 +18,21 @@
#define CUSTOM_EXTENSION_INIT
+#undef MINIFI_CREATE_EXTENSION_FN
+
#include "unit/TestBase.h"
#include "unit/Catch.h"
#include "unit/TestUtils.h"
#include "core/extension/ExtensionManager.h"
#include "core/extension/ApiVersion.h"
+
+extern "C" {
+MinifiStatus MinifiCreateCppExtension_MatchingBuildId(MinifiExtension* extension, const MinifiExtensionCreateInfo* extension_create_info) {
+ return MinifiCreateExtension(extension, extension_create_info);
+}
+} // extern "C"
+
namespace minifi = org::apache::nifi::minifi;
class ExtensionLoadingTestController {
diff --git a/libminifi/test/integration/extension-verification-test/dummy-cpp-api.def b/libminifi/test/integration/extension-verification-test/dummy-cpp-api.def
index 8da19c75e..33c34291e 100644
--- a/libminifi/test/integration/extension-verification-test/dummy-cpp-api.def
+++ b/libminifi/test/integration/extension-verification-test/dummy-cpp-api.def
@@ -1,3 +1,4 @@
LIBRARY core-minifi.dll
EXPORTS
MinifiCreateCppExtension_NonMatchingBuildId
+ MinifiCreateCppExtension_MatchingBuildId