From 0b709fcb5b8d259d170dc46455ecd113f6a9d39f Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Jul 11 2013 20:07:55 +0000
Subject: Increase timeout from 1h to 4h.


---

diff --git a/0001-.-run-Increase-default-timeout-from-1h-4h.patch b/0001-.-run-Increase-default-timeout-from-1h-4h.patch
new file mode 100644
index 0000000..da906b3
--- /dev/null
+++ b/0001-.-run-Increase-default-timeout-from-1h-4h.patch
@@ -0,0 +1,46 @@
+From a7b9d61cde63020686afe769ca8265a01fce208f Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Thu, 11 Jul 2013 21:05:56 +0100
+Subject: [PATCH] ./run: Increase default timeout from 1h -> 4h.
+
+1 hour was not long enough for the C API tests when run in Koji.
+
+This update commit caab9f1e6f7ac0d8d5209c31854d640b807519ce.
+---
+ run.in | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/run.in b/run.in
+index d8b2e03..e132055 100755
+--- a/run.in
++++ b/run.in
+@@ -222,11 +222,15 @@ fi
+ #  - print how long it takes to run the test
+ #  - timeout if the test takes too long to run
+ 
++# Originally 1h, but that is not long enough to run the C API
++# tests on Koji.
++timeout_period=4h
++
+ # Do we have Padraig's timeout utility (from coreutils)?
+ if timeout --help >/dev/null 2>&1; then
+-    # Timeout (SIGTERM) after 1 hour.
++    # Timeout (SIGTERM) after $timeout_period.
+     # Then send a second SIGKILL 30 seconds later.
+-    timeout="timeout -k 30s 1h"
++    timeout="timeout -k 30s $timeout_period"
+ fi
+ 
+ pid=$$
+@@ -246,7 +250,7 @@ elif [ "$fail" -eq 124 ]; then
+     # Timed out.
+     echo "$b/run --test" "$@"
+     cat $tmpout
+-    echo "$b/run: command timed out after 1 hour"
++    echo "$b/run: command timed out after $timeout_period"
+ else
+     # Test failed.
+     echo "$b/run --test" "$@"
+-- 
+1.8.3.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 6bfd0bf..2054b8b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -12,7 +12,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.23.8
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
@@ -22,6 +22,7 @@ Source0:       http://libguestfs.org/download/1.23-development/%{name}-%{version
 Patch1:        0001-golang-Fix-it-so-it-builds-if-libguestfs-is-not-inst.patch
 Patch2:        0001-.-run-Add-a-better-comment-describing-test-mode.patch
 Patch3:        0002-.-run-Timeout-tests-after-1-hour.patch
+Patch4:        0001-.-run-Increase-default-timeout-from-1h-4h.patch
 
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
@@ -541,6 +542,7 @@ for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     # For sVirt to work, the local temporary directory we use in the
@@ -914,7 +916,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
-* Thu Jul 11 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.23.8-3
+* Thu Jul 11 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.23.8-4
 - Add patches to ./run so we capture errors when i686 tests time out.
 
 * Tue Jul  9 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.23.8-2