From f3864dded60cfc1c885a8cd8eb01d40f5412a82e260112645e17207761662467 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Wed, 27 Dec 2023 12:13:11 +0000
Subject: [PATCH] Accepting request 1135301 from
 home:cboltz:branches:mozilla:Factory

- add nss-allow-slow-tests-s390x.patch: "certutil dump keys with
  explicit default trust flags" test needs longer than the allowed
  6 seconds on s390x

OBS-URL: https://build.opensuse.org/request/show/1135301
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=432
---
 mozilla-nss.changes              |  7 +++++++
 mozilla-nss.spec                 |  5 +++++
 nss-allow-slow-tests-s390x.patch | 13 +++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 nss-allow-slow-tests-s390x.patch

diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index ed15b1b..4433a9a 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 26 15:34:48 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- add nss-allow-slow-tests-s390x.patch: "certutil dump keys with
+  explicit default trust flags" test needs longer than the allowed
+  6 seconds on s390x
+
 -------------------------------------------------------------------
 Sun Dec 17 12:38:06 UTC 2023 - Wolfgang Rosenauer <wr@rosenauer.org>
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 7958504..1ef4fcb 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -78,6 +78,7 @@ Patch45:        nss-fips-drbg-libjitter.patch
 Patch46:        nss-allow-slow-tests.patch
 Patch47:        nss-fips-pct-pubkeys.patch
 Patch48:        nss-fips-test.patch
+Patch49:        nss-allow-slow-tests-s390x.patch
 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
 # aarch64 + gcc4.8 fails to build on SLE-12 due to undefined references
 BuildRequires:  gcc9-c++
@@ -233,6 +234,10 @@ cd nss
 %patch46 -p1
 %patch47 -p1
 %patch48 -p1
+%ifarch s390x
+# slow test on s390x, permit more time
+%patch49 -p1
+%endif
 
 # additional CA certificates
 #cd security/nss/lib/ckfw/builtins
diff --git a/nss-allow-slow-tests-s390x.patch b/nss-allow-slow-tests-s390x.patch
new file mode 100644
index 0000000..c7b13d5
--- /dev/null
+++ b/nss-allow-slow-tests-s390x.patch
@@ -0,0 +1,13 @@
+On s390x, this test takes more than 6 seconds (build log says 12 seconds)
+
+--- nss/tests/dbtests/dbtests.sh.orig	2023-12-26 16:48:17.186506407 +0100
++++ nss/tests/dbtests/dbtests.sh	2023-12-26 16:49:13.323116874 +0100
+@@ -367,7 +367,7 @@ dbtest_main()
+       TIMEARRAY=(${RARRAY[1]//./ })
+       echo "${TIMEARRAY[0]} seconds"
+       # Was 5, but that is too small for OBS-workers.
+-      test ${TIMEARRAY[0]} -lt 6
++      test ${TIMEARRAY[0]} -lt 15
+       ret=$?
+       html_msg ${ret} 0 "certutil dump keys with explicit default trust flags"
+     fi