From f6c8f7f8fcd5b20af111a659ca3041693b1097ce Mon Sep 17 00:00:00 2001 From: Sylvain Leclerc Date: Tue, 7 Nov 2023 11:33:43 +0100 Subject: [PATCH] Fix Oracle Linux minizip build + actually run zip unit tests (#1744) * Add unit label to zip writer test Signed-off-by: Sylvain Leclerc * Enable oracle linux build only Signed-off-by: Sylvain Leclerc * Fix test property Signed-off-by: Sylvain Leclerc * Enable oracle linux CI Signed-off-by: Sylvain Leclerc * Retry oracle CI Signed-off-by: Sylvain Leclerc * Install zlib on oracle linux build image Signed-off-by: Sylvain Leclerc * Revert "Enable oracle linux build only" This reverts commit 02abf462821a751b7fed90e2df1394b0e10b7230. * Revert oracle CI activation Signed-off-by: Sylvain Leclerc * Add other missing test labels Signed-off-by: Sylvain Leclerc * Fix test name Signed-off-by: Sylvain Leclerc --------- Signed-off-by: Sylvain Leclerc --- .github/workflows/oracle8.yml | 2 +- src/tests/src/libs/antares/CMakeLists.txt | 2 +- src/tests/src/libs/antares/concurrency/CMakeLists.txt | 1 + src/tests/src/libs/antares/writer/CMakeLists.txt | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index efbff48a81..2dc9f229da 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -34,7 +34,7 @@ jobs: - name: Install libraries run: | dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core - dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain + dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-9-toolchain zlib-devel - name: Checkout run: | diff --git a/src/tests/src/libs/antares/CMakeLists.txt b/src/tests/src/libs/antares/CMakeLists.txt index a6771db392..641d0132dc 100644 --- a/src/tests/src/libs/antares/CMakeLists.txt +++ b/src/tests/src/libs/antares/CMakeLists.txt @@ -113,4 +113,4 @@ target_link_libraries(test-utils yuni-static-core ) add_test(NAME test-utils COMMAND test-utils) - +set_property(TEST test-utils PROPERTY LABELS unit) diff --git a/src/tests/src/libs/antares/concurrency/CMakeLists.txt b/src/tests/src/libs/antares/concurrency/CMakeLists.txt index 71cc0484c4..489eced2ea 100644 --- a/src/tests/src/libs/antares/concurrency/CMakeLists.txt +++ b/src/tests/src/libs/antares/concurrency/CMakeLists.txt @@ -9,3 +9,4 @@ target_link_libraries(test-concurrency ) add_test(NAME concurrency COMMAND test-concurrency) +set_property(TEST concurrency PROPERTY LABELS unit) diff --git a/src/tests/src/libs/antares/writer/CMakeLists.txt b/src/tests/src/libs/antares/writer/CMakeLists.txt index 5d0e479419..818e83f18d 100644 --- a/src/tests/src/libs/antares/writer/CMakeLists.txt +++ b/src/tests/src/libs/antares/writer/CMakeLists.txt @@ -11,3 +11,5 @@ target_link_libraries(test-writer ) add_test(NAME writer COMMAND test-writer) + +set_tests_properties(writer PROPERTIES LABELS unit)