diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2eb1c7..584c0ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: stages: - build - unit_test - - hardware_test - deploy #------------------------------------------------------------------------------- @@ -307,119 +306,6 @@ unit_test linux/fedora/39/amd64/clang: needs: - build linux/fedora/39/amd64/clang -.hw_test: &hw_test - stage: hardware_test - tags: - - libicsneo_hil - timeout: 5m - script: - - echo $GUEST_OS_TAG - - echo $DEVICE_PORT - - /opt/libvirt-driver/prepare.sh - - /opt/libvirt-driver/run.sh - after_script: - - /opt/libvirt-driver/cleanup.sh - allow_failure: true - -.fedora38_needs: &fedora38_needs - needs: - - job: build linux/fedora/38/amd64/clang - artifacts: true - -hardware_test fedora38-red2: - <<: *hw_test - <<: *fedora38_needs - variables: - GUEST_OS_TAG: fedora38 - DEVICE_PORT: ETH_A - -hardware_test fedora38-vcan42: - <<: *hw_test - <<: *fedora38_needs - variables: - GUEST_OS_TAG: fedora38 - DEVICE_PORT: USB_D - -hardware_test fedora38-fire3: - <<: *hw_test - <<: *fedora38_needs - variables: - GUEST_OS_TAG: fedora38 - DEVICE_PORT: ETH_B - -hardware_test fedora38-vcan42-EL: - <<: *hw_test - <<: *fedora38_needs - variables: - GUEST_OS_TAG: fedora38 - DEVICE_PORT: USB_C - -.ubuntu2204_needs: &ubuntu2204_needs - needs: - - job: build linux/ubuntu/2204/amd64/clang - artifacts: true - -hardware_test ubuntu2204-red2: - <<: *hw_test - <<: *ubuntu2204_needs - variables: - GUEST_OS_TAG: ubuntu22.04 - DEVICE_PORT: ETH_A - -hardware_test ubuntu2204-vcan42: - <<: *hw_test - <<: *ubuntu2204_needs - variables: - GUEST_OS_TAG: ubuntu22.04 - DEVICE_PORT: USB_D - -hardware_test ubuntu2204-fire3: - <<: *hw_test - <<: *ubuntu2204_needs - variables: - GUEST_OS_TAG: ubuntu22.04 - DEVICE_PORT: ETH_B - -hardware_test ubuntu2204-vcan42-EL: - <<: *hw_test - <<: *ubuntu2204_needs - variables: - GUEST_OS_TAG: ubuntu22.04 - DEVICE_PORT: USB_C - -.win10_needs: &win10_needs - needs: - - job: build windows/x64 - artifacts: true - -hardware_test win10-red2: - <<: *hw_test - <<: *win10_needs - variables: - GUEST_OS_TAG: win10 - DEVICE_PORT: ETH_A - -hardware_test win10-vcan42: - <<: *hw_test - <<: *win10_needs - variables: - GUEST_OS_TAG: win10 - DEVICE_PORT: USB_D - -hardware_test win10-fire3: - <<: *hw_test - <<: *win10_needs - variables: - GUEST_OS_TAG: win10 - DEVICE_PORT: ETH_B - -hardware_test win10-vcan42-EL: - <<: *hw_test - <<: *win10_needs - variables: - GUEST_OS_TAG: win10 - DEVICE_PORT: USB_C - #------------------------------------------------------------------------------- # Python Module #------------------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 54f0745..fc9595d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ if(POLICY CMP0135) endif() option(LIBICSNEO_BUILD_UNIT_TESTS "Build unit tests." OFF) -option(LIBICSNEO_BUILD_SYSTEM_TESTS "Build system tests." OFF) option(LIBICSNEO_BUILD_DOCS "Build documentation. Don't use in Visual Studio." OFF) option(LIBICSNEO_BUILD_EXAMPLES "Build examples." ON) option(LIBICSNEO_BUILD_ICSNEOC "Build dynamic C library" ON) @@ -543,22 +542,6 @@ if(LIBICSNEO_BUILD_UNIT_TESTS) add_test(NAME libicsneo-unit-test-suite COMMAND libicsneo-unit-tests) endif() -if(LIBICSNEO_BUILD_SYSTEM_TESTS) - if(DEFINED ENV{LIBICSNEO_SYSTEM_TESTS}) - include(FetchContent) - file(MAKE_DIRECTORY test/system) - FetchContent_Declare( - SystemTests - GIT_REPOSITORY $ENV{LIBICSNEO_SYSTEM_TESTS} - GIT_TAG main - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test/system - ) - FetchContent_MakeAvailable(SystemTests) - else() - message("System test repo not defined!") - endif() -endif() - set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_VERSION ${PROJECT_VERSION}) include(CPack) \ No newline at end of file diff --git a/ci/build-posix.sh b/ci/build-posix.sh index c07d495..07a2748 100644 --- a/ci/build-posix.sh +++ b/ci/build-posix.sh @@ -1,7 +1,7 @@ #!/bin/sh cmake -GNinja -Bbuild -DCMAKE_BUILD_TYPE=Release -DLIBICSNEO_BUILD_EXAMPLES=ON \ - -DLIBICSNEO_BUILD_UNIT_TESTS=ON -DLIBICSNEO_BUILD_SYSTEM_TESTS=ON -DLIBICSNEO_ENABLE_TCP=OFF || exit 1 + -DLIBICSNEO_BUILD_UNIT_TESTS=ON -DLIBICSNEO_ENABLE_TCP=OFF || exit 1 cmake --build build || exit 1 diff --git a/ci/build-windows.bat b/ci/build-windows.bat index 502cc07..6fca7b0 100644 --- a/ci/build-windows.bat +++ b/ci/build-windows.bat @@ -6,7 +6,7 @@ REM build cd build set CFLAGS=/WX set CXXFLAGS=/WX -cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBICSNEO_BUILD_UNIT_TESTS=ON -DLIBICSNEO_BUILD_SYSTEM_TESTS=ON -DLIBICSNEO_ENABLE_TCP=ON .. +cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DLIBICSNEO_BUILD_UNIT_TESTS=ON -DLIBICSNEO_ENABLE_TCP=ON .. if %errorlevel% neq 0 exit /b %errorlevel% cmake --build . if %errorlevel% neq 0 exit /b %errorlevel%