diff --git a/.github/workflows/fastcdr-test.yml b/.github/workflows/fastcdr-test.yml index ba5b6436..f8b35977 100644 --- a/.github/workflows/fastcdr-test.yml +++ b/.github/workflows/fastcdr-test.yml @@ -66,7 +66,7 @@ jobs: - name: Get minimum supported version of CMake uses: eProsima/eProsima-CI/external/get-cmake@v0 with: - cmakeVersion: '3.22.6' + cmakeVersion: '3.16.3' - name: Install Colcon dependencies uses: eProsima/eProsima-CI/multiplatform/install_colcon@v0 @@ -89,7 +89,7 @@ jobs: with: colcon_build_args_default: --event-handlers=console_direct+ cmake_args: ${{ inputs.cmake_args }} - cmake_args_default: -DBUILD_TESTING=ON + cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON cmake_build_type: RelWithDebInfo workspace: ${{ github.workspace }} @@ -99,7 +99,7 @@ jobs: with: colcon_test_args_default: --event-handlers=console_direct+ --return-code-on-test-failure ctest_args: ${{ inputs.ctest_args }} - ctest_args_default: --repeat until-pass:3 --timeout 300 --output-junit junit/junit.xml + ctest_args_default: --repeat until-pass:3 --timeout 300 packages_names: fastcdr workspace: ${{ github.workspace }} diff --git a/cmake/testing/GoogleTest.cmake b/cmake/testing/GoogleTest.cmake deleted file mode 100644 index c10612a5..00000000 --- a/cmake/testing/GoogleTest.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2023 Proyectos y Sistemas de Mantenimiento SL (eProsima). -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include(GoogleTest) - -function(gtest_discover_tests TARGET) - cmake_minimum_required(VERSION 3.22) - if (WIN32) - add_custom_command( - TARGET ${TARGET} POST_BUILD - COMMAND ${CMAKE_COMMAND} -DTARGET=${TARGET} -DCONFIG=$ -DRUNTIME_LIST=$ -P ${CMAKE_SOURCE_DIR}/cmake/testing/generate_google_test_win_wrapper.cmake - COMMAND_EXPAND_LISTS - VERBATIM - ) - - set(CMAKE_COMMAND "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_win_wrapper_$.bat") - endif() - _gtest_discover_tests(${TARGET} ${ARGN}) -endfunction()