From ca77ba1e5a4f79e88f204b8766b8519d607fea6f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 31 Jul 2020 08:53:14 +0100
Subject: [PATCH] Add upstream patch to try to track down test failure in Koji.

---
 0001-tests-test-nozero.sh-Add-set-x.patch | 25 +++++++++++++++++++++++
 nbdkit.spec                               |  8 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 0001-tests-test-nozero.sh-Add-set-x.patch

diff --git a/0001-tests-test-nozero.sh-Add-set-x.patch b/0001-tests-test-nozero.sh-Add-set-x.patch
new file mode 100644
index 0000000..b4d4649
--- /dev/null
+++ b/0001-tests-test-nozero.sh-Add-set-x.patch
@@ -0,0 +1,25 @@
+From 5dc844e5b481b32915d38a9e5dd32bef3e698957 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 31 Jul 2020 08:51:37 +0100
+Subject: [PATCH] tests/test-nozero.sh: Add set -x.
+
+Used to track down a failure in this test which only happens in Koji.
+---
+ tests/test-nozero.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/test-nozero.sh b/tests/test-nozero.sh
+index 444c1b70..9a815814 100755
+--- a/tests/test-nozero.sh
++++ b/tests/test-nozero.sh
+@@ -32,6 +32,7 @@
+ 
+ source ./functions.sh
+ set -e
++set -x
+ 
+ sock2=`mktemp -u`
+ sock3=`mktemp -u`
+-- 
+2.28.0.rc2
+
diff --git a/nbdkit.spec b/nbdkit.spec
index 9d502f9..f5ce366 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -45,7 +45,7 @@ ExclusiveArch:  x86_64
 
 Name:           nbdkit
 Version:        1.21.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -58,6 +58,9 @@ Source1:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
 Source2:       libguestfs.keyring
 %endif
 
+# Upsream patch to try to track down test failure.
+Patch1:        0001-tests-test-nozero.sh-Add-set-x.patch
+
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@@ -1068,6 +1071,9 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
+* Fri Jul 31 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.20-3
+- Add upstream patch to try to track down test failure in Koji.
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild