From 0ab1eba0c6fe0fd9bfcce5660c1ae1877fd85e50 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 1 Sep 2012 11:55:25 +0200
Subject: php-redis use daemonize mode, cleaner I think

---
 php-redis.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'php-redis.spec')

diff --git a/php-redis.spec b/php-redis.spec
index 8556497..2f1b9de 100644
--- a/php-redis.spec
+++ b/php-redis.spec
@@ -134,7 +134,7 @@ cd nts/tests
 # Launch redis server
 mkdir -p {run,log,lib}/redis
 sed -e "s:/var:$PWD:" \
-    -e "/daemonize/s/yes/no/" \
+    -e "/daemonize/s/no/yes/" \
     /etc/redis.conf >redis.conf
 %if 0%{?__isa_bits}
 # port number to allow 32/64 build at same time
@@ -143,8 +143,7 @@ port=$(expr %{__isa_bits} + 6350)
 sed -e "s/6379/$port/" -i redis.conf
 sed -e "s/6379/$port/" -i TestRedis.php
 %endif
-%{_sbindir}/redis-server ./redis.conf &
-srv=$!
+%{_sbindir}/redis-server ./redis.conf
 
 # Run the test Suite
 ret=0
@@ -155,9 +154,12 @@ php --no-php-ini \
     TestRedis.php || ret=1
 
 # Cleanup
-kill $srv || :
+if [ -f run/redis/redis.pid ]; then
+   kill $(cat run/redis/redis.pid)
+fi
 
 exit $ret
+
 %else
 : Upstream test suite disabled
 %endif
-- 
cgit