Accepting request 1206645 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/1206645
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ccache?expand=0&rev=82

ccache.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Oct 10 07:38:46 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Really run tests and Unit tests in %check
+
+-------------------------------------------------------------------
+Wed Oct  9 07:02:39 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- avoid optional dependency on doctest on SLE16 and older
+- unbundle cpp-httplib for new enough distributions
+
 -------------------------------------------------------------------
 Thu Sep 12 14:07:19 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

ccache.spec

@@ -22,6 +22,12 @@
 %else
 %bcond_with hiredis
 %endif
+# Run tests only on TW
+%if %{?suse_version} > 1600
+%bcond_without test
+%else
+%bcond_with test
+%endif
 Name:           ccache
 Version:        4.10.2
 Release:        0
@@ -32,12 +38,12 @@ Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/c
 Source1:        https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 BuildRequires:  cmake
-BuildRequires:  doctest-devel
 BuildRequires:  fmt-devel
 %if %{?suse_version} > 1500
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-# SLE requires gcc11 for std::filesystem
+BuildRequires:  pkgconfig(cpp-httplib)
+# SLE15 requires gcc11 for std::filesystem
 %else
 BuildRequires:  gcc11
 BuildRequires:  gcc11-c++
@@ -48,11 +54,12 @@ BuildRequires:  xxhash-devel
 BuildRequires:  pkgconfig(libzstd) >= 1.1.2
 BuildRequires:  rubygem(asciidoctor)
 Provides:       distcc:%{_bindir}/ccache
-%ifnarch %{ix86} %{arm}
-%endif
 %if %{with hiredis}
 BuildRequires:  pkgconfig(hiredis) >= 0.13.3
 %endif
+%if %{with test}
+BuildRequires:  doctest-devel
+%endif
 
 %description
 ccache is a compiler cache. It speeds up recompilation by caching the
@@ -69,6 +76,9 @@ export CC=gcc-11 CXX=g++-11
 %endif
 %cmake \
   -DFETCHCONTENT_FULLY_DISCONNECTED=ON \
+%if %{without test}
+  -DENABLE_TESTING=OFF \
+%endif
 %if !%{with hiredis}
   -DREDIS_STORAGE_BACKEND=OFF \
 %endif
@@ -96,8 +106,14 @@ ln -sf ../../bin/%{name} c++
 ln -sf ../../bin/%{name} nvcc
 
 %check
-# running the test with multiple threads will make tests fail
+%if %{with test}
-%{__ctest} --output-on-failure --force-new-ctest-process -j1
+for dir in build/test build/unittest; do
+  pushd $dir
+  # running the test with multiple threads will make tests fail
+  %{__ctest} --output-on-failure --force-new-ctest-process -j1
+  popd
+done
+%endif
 
 %files
 %license LICENSE.* GPL-3.0.txt