packages: varnish/varnish.spec - no need to start daemon ourselves

glen glen at pld-linux.org
Thu Apr 15 13:10:31 CEST 2010


Author: glen                         Date: Thu Apr 15 11:10:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no need to start daemon ourselves

---- Files affected:
packages/varnish:
   varnish.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: packages/varnish/varnish.spec
diff -u packages/varnish/varnish.spec:1.52 packages/varnish/varnish.spec:1.53
--- packages/varnish/varnish.spec:1.52	Thu Apr 15 12:58:58 2010
+++ packages/varnish/varnish.spec	Thu Apr 15 13:10:23 2010
@@ -4,7 +4,7 @@
 # - some -l missing: /usr/lib64/libvcl.so.1.0.0
 #
 # Conditional build:
-%bcond_with	tests		# build without tests. needs http daemon on 127.0.0.1:80
+%bcond_with	tests		# build without tests. binds daemon on 127.0.0.1 9080, 9081, 9001 ports
 
 Summary:	Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
@@ -113,18 +113,8 @@
 %{__make}
 
 %if %{with tests}
-workdir=$(pwd)/workdir
-install -d $workdir
-
-# start varnishd
-LD_LIBRARY_PATH="lib/libvarnish/.libs:lib/libvarnishcompat/.libs:lib/libvarnishapi/.libs:lib/libvcl/.libs" \
-./bin/varnishd/varnishd -b 127.0.0.1:80 -C -n $workdir -P $workdir/pid
-
 %{__make} check \
 	LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs"
-
-# kill varnishd
-kill $(cat $workdir/pid)
 %endif
 
 %install
@@ -225,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2010/04/15 11:10:23  glen
+- no need to start daemon ourselves
+
 Revision 1.52  2010/04/15 10:58:58  glen
 - add tests; All 145 tests passed on carme
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.spec?r1=1.52&r2=1.53&f=u



More information about the pld-cvs-commit mailing list