From e4aaff0fdb38f6c7963bbe07b98b538bafbf670d Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 19 Sep 2024 13:22:59 +0200
Subject: [PATCH] Use make xcheck in such a way that xtests are actually built

---
 glibc.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 649224e..9b5fb9e 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -169,7 +169,7 @@ Version: %{glibcversion}
 # - It allows using the Release number without the %%dist tag in the dependency
 #   generator to make the generated requires interchangeable between Rawhide
 #   and ELN (.elnYY < .fcXX).
-%global baserelease 2
+%global baserelease 3
 Release: %{baserelease}%{?dist}
 
 # Licenses:
@@ -2249,10 +2249,15 @@ run_tests () {
     done <rpmbuild.tests.sum.not-passing
   fi
 
-  # Compile the xtests, so that they can be run separately later.
-  %make_build run-built-tests=no xcheck |& tee rpmbuild.xcheck.log
+  # Compile and run the xtests, so that they can be run separately later.
+  # 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
     echo "FAIL: xcheck test suite build of target: $(basename "$(pwd)")" >& 2
+    cat rpmbuild.xcheck
     exit 1
   fi
 
@@ -2581,6 +2586,9 @@ update_gconv_modules_cache ()
 %endif
 
 %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
 - Ensure that xtests can be built