From 6ea106b71381da1687c4fea8ea2980615748e60d Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kkleine@redhat.com>
Date: Mon, 9 Dec 2024 19:48:25 +0100
Subject: [PATCH] Disable libomp tests on s390x RHEL entirely

Related: https://issues.redhat.com/browse/RHEL-68696
---
 llvm.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/llvm.spec b/llvm.spec
index 09fc474..da46ace 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -182,7 +182,7 @@
 #region main package
 Name:		%{pkg_name_llvm}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	Apache-2.0 WITH LLVM-exception OR NCSA
@@ -1604,6 +1604,7 @@ test_list_filter_out+=("libomp :: worksharing/for/omp_collapse_one_int.c")
 
 %ifarch s390x
 test_list_filter_out+=("libomp :: flush/omp_flush.c")
+test_list_filter_out+=("libomp :: worksharing/for/omp_for_schedule_guided.c")
 %endif
 
 %ifarch aarch64 s390x
@@ -1714,7 +1715,14 @@ export LIT_XFAIL="$LIT_XFAIL;offloading/thread_state_2.c"
 
 export LIT_FILTER_OUT=$(test_list_to_regex test_list_filter_out)
 
+%if 0%{?rhel}
+# libomp tests are often very slow on s390x brew builders
+%ifnarch s390x
 %cmake_build --target check-openmp
+%endif
+%else
+%cmake_build --target check-openmp
+%endif
 #endregion Test OPENMP
 
 %if %{with lldb}
@@ -2506,6 +2514,9 @@ fi
 
 #region changelog
 %changelog
+* Mon Dec 09 2024 Konrad Kleine <kkleine@redhat.com> - 19.1.5-2
+- Disable libomp tests on s390x RHEL entirely.
+
 * Wed Dec 04 2024 Konrad Kleine <kkleine@redhat.com> - 19.1.5-1
 - Update to 19.1.5
 - Enable LLVM_ENABLE_ZSTD (rhbz#2321848)