Use make xcheck in such a way that xtests are actually built

This commit is contained in:
Florian Weimer 2024-09-19 13:22:59 +02:00
parent e2bae39a8f
commit e4aaff0fdb

View File

@ -169,7 +169,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 2 %global baserelease 3
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# Licenses: # Licenses:
@ -2249,10 +2249,15 @@ run_tests () {
done <rpmbuild.tests.sum.not-passing done <rpmbuild.tests.sum.not-passing
fi fi
# Compile the xtests, so that they can be run separately later. # Compile and run the xtests, so that they can be run separately later.
%make_build run-built-tests=no xcheck |& tee rpmbuild.xcheck.log # Reduce timeout factor to complete the tests in a reasonable time
# (in case something was made an xtest due to excessive run time).
# Do not look at the test results; they are expected to fail in most
# cases.
TIMEOUT_FACTOR=1 %make_build xcheck > rpmbuild.xcheck.log 2>&1 || true
if ! grep -Eq '^\s+=== Summary of results for extra tests ===$' rpmbuild.xcheck.log ; then if ! grep -Eq '^\s+=== Summary of results for extra tests ===$' rpmbuild.xcheck.log ; then
echo "FAIL: xcheck test suite build of target: $(basename "$(pwd)")" >& 2 echo "FAIL: xcheck test suite build of target: $(basename "$(pwd)")" >& 2
cat rpmbuild.xcheck
exit 1 exit 1
fi fi
@ -2581,6 +2586,9 @@ update_gconv_modules_cache ()
%endif %endif
%changelog %changelog
* Thu Sep 19 2024 Florian Weimer <fweimer@redhat.com> - 2.40.9000-3
- Use make xcheck in such a way that xtests are actually built
* Thu Sep 19 2024 Florian Weimer <fweimer@redhat.com> - 2.40.9000-2 * Thu Sep 19 2024 Florian Weimer <fweimer@redhat.com> - 2.40.9000-2
- Ensure that xtests can be built - Ensure that xtests can be built