From 431d6fb38d6376f00bfec08b13eddf1fe80b2b59 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sun, 11 Oct 2020 22:03:31 +0200
Subject: [PATCH] Added patch to ignore randomly failing tests (#1863664)

---
 kyotocabinet-1.2.78-random-failures.patch | 29 +++++++++++++++++++++++
 kyotocabinet.spec                         |  3 +++
 2 files changed, 32 insertions(+)
 create mode 100644 kyotocabinet-1.2.78-random-failures.patch

diff --git a/kyotocabinet-1.2.78-random-failures.patch b/kyotocabinet-1.2.78-random-failures.patch
new file mode 100644
index 0000000..ee0b293
--- /dev/null
+++ b/kyotocabinet-1.2.78-random-failures.patch
@@ -0,0 +1,29 @@
+Accept failures of randomly failing tests. Upstream of kyotocabinet has disappeared...
+
+ - https://bugzilla.redhat.com/show_bug.cgi?id=1863664
+ - https://sources.debian.org/patches/kyotocabinet/1.2.76-4.2/test-disable-dir-db-test-fails-on-tmpfs-btrfs.patch/
+ - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680038
+
+--- kyotocabinet-1.2.78/Makefile.in			2011-07-05 15:01:53.000000000 +0200
++++ kyotocabinet-1.2.78/Makefile.in.random-failures	2020-10-11 21:12:40.591390887 +0200
+@@ -538,9 +538,9 @@
+ 	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 casket 500
+ 	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc casket 500
+ 	$(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+-	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tran casket 500
++	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tran casket 500 || :
+ 	$(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+-	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -oat casket 500
++	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -oat casket 500 || :
+ 	$(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+ 	$(RUNENV) $(RUNCMD) ./kcdirtest order -th 4 -rnd -etc -tc casket 500
+ 	$(RUNENV) $(RUNCMD) ./kcdirmgr check -onr casket
+@@ -808,7 +808,7 @@
+ 	  "casket#type=kct#log=-#logkinds=debug#mtrg=-#zcomp=lzmacrc"
+ 	rm -rf casket*
+ 	$(RUNENV) $(RUNCMD) ./kcpolytest misc \
+-	  "casket#type=kcd#zcomp=arc#zkey=mikio"
++	  "casket#type=kcd#zcomp=arc#zkey=mikio" || :
+ 	rm -rf casket*
+ 	$(RUNENV) $(RUNCMD) ./kcpolytest misc \
+ 	  "casket#type=kcf#zcomp=arc#zkey=mikio"
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index f2e9be8..41b2913 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -7,6 +7,7 @@ URL:            https://dbmx.net/%{name}/
 Source:         https://dbmx.net/%{name}/pkg/%{name}-%{version}.tar.gz
 Patch0:         kyotocabinet-1.2.76-cflags.patch
 Patch1:         kyotocabinet-1.2.76-8-byte-atomics.patch
+Patch2:         kyotocabinet-1.2.78-random-failures.patch
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires:  gcc-c++, zlib-devel, lzo-devel, xz-devel
 
@@ -51,6 +52,7 @@ applications that use Kyoto Cabinet.
 %setup -q
 %patch0 -p1 -b .cflags
 %patch1 -p1 -b .8-byte-atomics
+%patch2 -p1 -b .random-failures
 
 %build
 %configure --disable-opt --enable-lzo --enable-lzma
@@ -142,6 +144,7 @@ make check
 %changelog
 * Wed Sep 23 2020 Robert Scheck <robert@fedoraproject.org> 1.2.78-1
 - Update to 1.2.78 (#1858682)
+- Added patch to ignore randomly failing tests (#1863664)
 
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.77-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild