From ac08456e275ac5e59bf6e8d920e40dc8873773eb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 4 Mar 2021 23:24:11 +0100 Subject: [PATCH] - remove broken tests - rel 12 --- disable-broken-tests.patch | 89 ++++++++++++++++++++++++++++++++++++++ elektra.spec | 10 ++++- 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 disable-broken-tests.patch diff --git a/disable-broken-tests.patch b/disable-broken-tests.patch new file mode 100644 index 0000000..1b99ffe --- /dev/null +++ b/disable-broken-tests.patch @@ -0,0 +1,89 @@ +--- elektra-0.8.23/src/bindings/io/uv/CMakeLists.txt~ 2018-05-13 18:57:57.000000000 +0200 ++++ elektra-0.8.23/src/bindings/io/uv/CMakeLists.txt 2021-03-04 23:06:03.297061786 +0100 +@@ -54,39 +54,5 @@ + + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_UV_LIBRARY}.pc" DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}) + +- # Build test +- set (TESTEXENAME testio_${BINDING_VARIANT}) +- +- set (TEST_SOURCES $) +- add_headers (TEST_SOURCES) +- file (GLOB IO_TEST_SRC_FILES "${CMAKE_SOURCE_DIR}/src/bindings/io/test/test*.c") +- list (APPEND TEST_SOURCES ${IO_TEST_SRC_FILES}) +- list (APPEND TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/testio_${BINDING_VARIANT}.c") +- +- if (BUILD_FULL OR BUILD_STATIC) +- list (APPEND TEST_SOURCES $) # add sources for elektra-io-uv for static and full builds +- endif () +- +- add_executable (${TESTEXENAME} ${TEST_SOURCES}) +- add_dependencies (${TESTEXENAME} kdberrors_generated) +- +- target_include_directories (${TESTEXENAME} PUBLIC "${CMAKE_SOURCE_DIR}/tests/cframework") +- +- target_link_elektra (${TESTEXENAME} elektra-kdb elektra-plugin elektra-io ${IO_UV_LIBRARY} m) +- if (BUILD_FULL OR BUILD_STATIC) +- target_link_libraries (${TESTEXENAME} "${LIBUV_LIBRARIES};m") +- endif () +- +- if (LIBUV_VERSION VERSION_LESS "1.0") +- target_compile_definitions (${TESTEXENAME} PRIVATE "HAVE_LIBUV0") +- else () +- target_compile_definitions (${TESTEXENAME} PRIVATE "HAVE_LIBUV1") +- endif () +- +- add_test (NAME ${TESTEXENAME} +- COMMAND "${CMAKE_BINARY_DIR}/bin/${TESTEXENAME}" "${CMAKE_CURRENT_SOURCE_DIR}" +- WORKING_DIRECTORY "${WORKING_DIRECTORY}") +- set_property (TEST ${TESTEXENAME} PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") +- + add_subdirectory (example) + endif () +--- elektra-0.8.23/src/bindings/io/glib/CMakeLists.txt~ 2018-05-13 18:57:57.000000000 +0200 ++++ elektra-0.8.23/src/bindings/io/glib/CMakeLists.txt 2021-03-04 23:16:58.480231361 +0100 +@@ -39,34 +39,5 @@ + + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${IO_VARIANT_LIBRARY}.pc" DESTINATION lib${LIB_SUFFIX}/${TARGET_PKGCONFIG_FOLDER}) + +- # Build test +- set (testexename testio_${BINDING_VARIANT}) +- +- set (TEST_SOURCES $) +- add_headers (TEST_SOURCES) +- file (GLOB IO_TEST_SRC_FILES "${CMAKE_SOURCE_DIR}/src/bindings/io/test/test*.c") +- list (APPEND TEST_SOURCES ${IO_TEST_SRC_FILES}) +- list (APPEND TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/testio_${BINDING_VARIANT}.c") +- +- if (BUILD_FULL OR BUILD_STATIC) # add sources for elektra-io-glib for static and full builds +- list (APPEND TEST_SOURCES $) +- endif () +- +- add_executable (${testexename} ${TEST_SOURCES}) +- add_dependencies (${testexename} kdberrors_generated) +- +- target_include_directories (${testexename} PUBLIC "${CMAKE_SOURCE_DIR}/tests/cframework") +- target_include_directories (${testexename} PUBLIC SYSTEM ${GLIB_INCLUDE_DIRS}) +- +- target_link_elektra (${testexename} elektra-kdb elektra-plugin elektra-io ${IO_VARIANT_LIBRARY} m) +- if (BUILD_FULL OR BUILD_STATIC) +- target_link_libraries (${testexename} ${GLIB_LIBRARIES}) +- endif () +- +- add_test (NAME ${testexename} +- COMMAND "${CMAKE_BINARY_DIR}/bin/${testexename}" "${CMAKE_CURRENT_SOURCE_DIR}" +- WORKING_DIRECTORY "${WORKING_DIRECTORY}") +- set_property (TEST ${testexename} PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib") +- + add_subdirectory (example) + endif () +--- elektra-0.8.23/CMakeLists.txt~ 2018-05-13 18:57:57.000000000 +0200 ++++ elektra-0.8.23/CMakeLists.txt 2021-03-04 23:21:10.222371932 +0100 +@@ -85,7 +85,6 @@ + + add_subdirectory (src) + add_subdirectory (examples) +- add_subdirectory (benchmarks) + + if (BUILD_TESTING) + add_subdirectory (tests) diff --git a/elektra.spec b/elektra.spec index cd5a6b3..14fcc52 100644 --- a/elektra.spec +++ b/elektra.spec @@ -28,13 +28,14 @@ Summary: A key/value pair database to store software configurations Summary(pl.UTF-8): Baza kluczy/wartości do przechowywania konfiguracji oprogramowania Name: elektra Version: 0.8.23 -Release: 11 +Release: 12 License: BSD Group: Applications/System Source0: https://www.libelektra.org/ftp/elektra/releases/%{name}-%{version}.tar.gz # Source0-md5: 0a065ed381a59b6213bd46fd3c82ba83 Patch0: %{name}-zsh.patch Patch1: %{name}-no-markdown.patch +Patch2: disable-broken-tests.patch URL: https://www.libelektra.org/ %if %{with qt} BuildRequires: Qt5Core-devel >= 5.3 @@ -516,10 +517,15 @@ Wiązanie języka Ruby dla Elektry. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' $(grep -l '/usr/bin/env bash' -r scripts) %{__sed} -i -e '1s,/usr/bin/env python,%{__python},' scripts/{find-tools,update-infos-status} +%{__rm} -r src/bindings/io/test +%{__rm} src/bindings/io/uv/testio_uv.c +%{__rm} src/bindings/io/glib/testio_glib.c + %build install -d build cd build @@ -532,7 +538,7 @@ cd build -DTOOLS="kdb;race%{?with_gen:;gen}%{?with_qt:;qt-gui}" \ -DBUILD_STATIC=ON -%{__make} -j1 +%{__make} %install rm -rf $RPM_BUILD_ROOT -- 2.43.0