Adjust ctest macro to use native out-of-tree support

With CMake 3.20, ctest(1) learned how to be told where the generated
working directory is, so we no longer have to change directories
(and thus, rely on shell semantics to get back out of that directory)
to make CTest work properly.

This change tweaks the %ctest macro such that we are leveraging that
new option and eliminates our usage of cd(1) as a workaround.
This commit is contained in:
Neal Gompa 2023-01-13 05:01:20 -05:00
parent 697509ac7d
commit 77b93ad1b9
2 changed files with 5 additions and 4 deletions

View File

@ -68,7 +68,7 @@
%{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 1
%global baserelease 2
# Uncomment if building for EPEL
#global name_suffix %%{major_version}
@ -525,6 +525,9 @@ popd
%changelog
* Fri Jan 13 2023 Neal Gompa <ngompa@fedoraproject.org> - 3.25.1-2
- Adjust ctest macro to use native out-of-tree support
* Mon Dec 05 2022 Björn Esser <besser82@fedoraproject.org> - 3.25.1-1
- cmake-3.25.1
Fixes rhbz#2149681

View File

@ -51,9 +51,7 @@
DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}"
%ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \
cd "%{__cmake_builddir}" \
%__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \
cd -
%__ctest --test-dir "%{__cmake_builddir}" --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**}
%cmake@@CMAKE_MAJOR_VERSION@@ %cmake