From 7113aee0b439b411602d8d7d4b03bf02bc91b800 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 1 Nov 2013 14:33:25 +0000
Subject: [PATCH] ./run: Disable timeouts in tests on RHEL 6.

Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1025269
---
 run.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/run.in b/run.in
index 0edad45ca..07e90885b 100755
--- a/run.in
+++ b/run.in
@@ -219,6 +219,7 @@ fi
 #    test fails
 #  - print how long it takes to run the test
 #  - timeout if the test takes too long to run
+#  - don't use timeout on RHEL 6 because it's broken (RHBZ#1025269)
 
 # Originally 1h, but that is not long enough to run the C API
 # tests on Koji.
@@ -229,11 +230,8 @@ timeout_kill=30s
 if timeout --help >/dev/null 2>&1; then
     # Does this version of timeout have the -k option?  (Not on RHEL 6)
     if timeout -k 10s 10s true >/dev/null 2>&1; then
-        timeout_k_opt="-k $timeout_kill"
+        timeout="timeout -k $timeout_kill $timeout_period"
     fi
-    # Timeout (SIGTERM) after $timeout_period.
-    # Then send a second SIGKILL $timeout_kill seconds later.
-    timeout="timeout $timeout_k_opt $timeout_period"
 fi
 
 pid=$$