diff --git a/.github/workflows/GccDebugMemcheck.yml b/.github/workflows/GccDebugMemcheck.yml index beb00b9..739dcd6 100644 --- a/.github/workflows/GccDebugMemcheck.yml +++ b/.github/workflows/GccDebugMemcheck.yml @@ -97,7 +97,6 @@ jobs: run: | cmake "$GITHUB_WORKSPACE" \ -DCMAKE_BUILD_TYPE=Debug \ - -DENABLE_CONAN=OFF \ -DENABLE_TESTING=ON \ -DBUILD_SHARED_LIBS=ON \ -DENABLE_DATATYPEIMPORT_TEST=ON \ diff --git a/.github/workflows/GccIntegrationTest.yml b/.github/workflows/GccIntegrationTest.yml index 5053030..569d501 100644 --- a/.github/workflows/GccIntegrationTest.yml +++ b/.github/workflows/GccIntegrationTest.yml @@ -92,7 +92,6 @@ jobs: run: | cmake "$GITHUB_WORKSPACE" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DENABLE_CONAN=OFF \ -DENABLE_TESTING=ON \ -DBUILD_SHARED_LIBS=ON \ -DENABLE_INTEGRATION_TEST=ON \ diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 07b5c69..463162f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -38,8 +38,7 @@ jobs: run: | cd ./nodesetLoader && cmake "-DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake-conan/conan_provider.cmake" -DCMAKE_BUILD_TYPE=Debug ` -DUA_NAMESPACE_ZERO=FULL ` - -DENABLE_TESTING=ON ` - -DENABLE_CONAN=ON . && ` + -DENABLE_TESTING=ON . && ` cmake --build . - name: Test diff --git a/CMakeLists.txt b/CMakeLists.txt index 077e2d3..03649ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ include(GNUInstallDirs) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) -option(ENABLE_CONAN "use conan for consuming dependencies" off) option(ENABLE_TESTING "enable tests" off) option(ENABLE_EXAMPLES "enable examples" on) option(ENABLE_BACKEND_STDOUT "backend for stdout" on) @@ -23,8 +22,6 @@ option(CALC_COVERAGE "calculate code coverage" off) set(ENABLE_INTEGRATION_TEST off) if(${ENABLE_BUILD_INTO_OPEN62541}) - # Disable conan, since open62541 provider all integration dependencies - set(ENABLE_CONAN off) # Disble code coverage, since this will be covered within open62541 set(CALC_COVERAGE off) diff --git a/backends/open62541/tests/integration/CMakeLists.txt b/backends/open62541/tests/integration/CMakeLists.txt index b06a207..7298dc4 100644 --- a/backends/open62541/tests/integration/CMakeLists.txt +++ b/backends/open62541/tests/integration/CMakeLists.txt @@ -8,62 +8,30 @@ find_program (BASH_PROGRAM bash) message(WARNING ${CMAKE_CURRENT_BINARY_DIR}) -#when open62541 is consumed via conan package, the binary output dir is changed?? -if(${ENABLE_CONAN}) - add_test(IntegrationTest_DI ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh - "${CMAKE_BINARY_DIR}/bin/integrationClient" - "${CMAKE_BINARY_DIR}/bin/DI/" - "${CMAKE_BINARY_DIR}/bin/refServer_DI" - "${CMAKE_BINARY_DIR}/bin/testServer" - "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml") - - - add_test(IntegrationTest_DI_PLCOpen ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh - "${CMAKE_BINARY_DIR}/bin/integrationClient" - "${CMAKE_BINARY_DIR}/bin/DI_PLCopen/" - "${CMAKE_BINARY_DIR}/bin/refServer_DI_PLCopen" - "${CMAKE_BINARY_DIR}/bin/testServer" - "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" - "${PLCOPEN_NODESET_PATH}" - ) - - - add_test(IntegrationTest_DI_Euromap_83_77 ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh - "${CMAKE_BINARY_DIR}/bin/integrationClient" - "${CMAKE_BINARY_DIR}/bin/DI_Euromap_83_77" - "${CMAKE_BINARY_DIR}/bin/refServer_DI_Euromap_83_77" - "${CMAKE_BINARY_DIR}/bin/testServer" - "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" - "${PROJECT_SOURCE_DIR}/nodesets/euromap/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml" - "${PROJECT_SOURCE_DIR}/nodesets/euromap/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml" - ) -else() - add_test(IntegrationTest_DI ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh - "${CMAKE_CURRENT_BINARY_DIR}/client/integrationClient" - "${CMAKE_CURRENT_BINARY_DIR}/Output/DI/" - "${CMAKE_CURRENT_BINARY_DIR}/reference_server/refServer_DI" - "${CMAKE_CURRENT_BINARY_DIR}/test_server/testServer" - "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml") - - - add_test(IntegrationTest_DI_PLCOpen ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh - "${CMAKE_CURRENT_BINARY_DIR}/client/integrationClient" - "${CMAKE_CURRENT_BINARY_DIR}/Output/DI_PLCopen/" - "${CMAKE_CURRENT_BINARY_DIR}/reference_server/refServer_DI_PLCopen" - "${CMAKE_CURRENT_BINARY_DIR}/test_server/testServer" - "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" - "${PLCOPEN_NODESET_PATH}" - ) - - - add_test(IntegrationTest_DI_Euromap_83_77 ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh - "${CMAKE_CURRENT_BINARY_DIR}/client/integrationClient" - "${CMAKE_CURRENT_BINARY_DIR}/Output/DI_Euromap_83_77" - "${CMAKE_CURRENT_BINARY_DIR}/reference_server/refServer_DI_Euromap_83_77" - "${CMAKE_CURRENT_BINARY_DIR}/test_server/testServer" - "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" - "${PROJECT_SOURCE_DIR}/nodesets/euromap/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml" - "${PROJECT_SOURCE_DIR}/nodesets/euromap/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml" - ) - -endif() +add_test(IntegrationTest_DI ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh + "${CMAKE_CURRENT_BINARY_DIR}/client/integrationClient" + "${CMAKE_CURRENT_BINARY_DIR}/Output/DI/" + "${CMAKE_CURRENT_BINARY_DIR}/reference_server/refServer_DI" + "${CMAKE_CURRENT_BINARY_DIR}/test_server/testServer" + "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml") + + +add_test(IntegrationTest_DI_PLCOpen ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh + "${CMAKE_CURRENT_BINARY_DIR}/client/integrationClient" + "${CMAKE_CURRENT_BINARY_DIR}/Output/DI_PLCopen/" + "${CMAKE_CURRENT_BINARY_DIR}/reference_server/refServer_DI_PLCopen" + "${CMAKE_CURRENT_BINARY_DIR}/test_server/testServer" + "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" + "${PLCOPEN_NODESET_PATH}" + ) + + +add_test(IntegrationTest_DI_Euromap_83_77 ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_DIR}/start_test.sh + "${CMAKE_CURRENT_BINARY_DIR}/client/integrationClient" + "${CMAKE_CURRENT_BINARY_DIR}/Output/DI_Euromap_83_77" + "${CMAKE_CURRENT_BINARY_DIR}/reference_server/refServer_DI_Euromap_83_77" + "${CMAKE_CURRENT_BINARY_DIR}/test_server/testServer" + "${open62541_NODESET_BASE_DIR}/DI/Opc.Ua.Di.NodeSet2.xml" + "${PROJECT_SOURCE_DIR}/nodesets/euromap/Opc.Ua.PlasticsRubber.GeneralTypes.NodeSet2.xml" + "${PROJECT_SOURCE_DIR}/nodesets/euromap/Opc.Ua.PlasticsRubber.IMM2MES.NodeSet2.xml" + )