packages: lighttpd/lighttpd.spec, lighttpd/test-port-setup.patch (NEW) - ra...

[glen]

Author: glen                         Date: Mon Dec 19 12:42:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- randomize test port on builders on same hardware

---- Files affected:
packages/lighttpd:
   lighttpd.spec (1.352 -> 1.353) , test-port-setup.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.352 packages/lighttpd/lighttpd.spec:1.353
--- packages/lighttpd/lighttpd.spec:1.352	Mon Dec 19 13:36:05 2011
+++ packages/lighttpd/lighttpd.spec	Mon Dec 19 13:42:48 2011
@@ -97,9 +97,10 @@
 Patch1:		%{name}-mod_evasive-status_code.patch
 Patch2:		%{name}-mod_h264_streaming.patch
 Patch3:		%{name}-branding.patch
-#Patch4:		%{name}-modinit-before-fork.patch
 Patch5:		%{name}-mod_deflate.patch
-#Patch8:		%{name}-errorlog-before-fork.patch
+Patch6:		test-port-setup.patch
+#Patch:		%{name}-modinit-before-fork.patch
+#Patch:		%{name}-errorlog-before-fork.patch
 URL:		http://www.lighttpd.net/
 %{?with_xattr:BuildRequires:	attr-devel}
 BuildRequires:	autoconf >= 2.57
@@ -827,6 +828,7 @@
 %patch2 -p1
 %patch3 -p1
 %{?with_deflate:%patch5 -p1}
+%patch6 -p1
 
 rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
 
@@ -867,6 +869,7 @@
 %{__make} -j1
 
 %if %{with tests}
+export LIGHTTPD_TEST_PORT=$((2048 + RANDOM % 10))
 %{__make} check
 %endif
 
@@ -1319,6 +1322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353  2011/12/19 12:42:48  glen
+- randomize test port on builders on same hardware
+
 Revision 1.352  2011/12/19 12:36:05  glen
 - up to 1.4.30
 

================================================================
Index: packages/lighttpd/test-port-setup.patch
diff -u /dev/null packages/lighttpd/test-port-setup.patch:1.1
--- /dev/null	Mon Dec 19 13:42:53 2011
+++ packages/lighttpd/test-port-setup.patch	Mon Dec 19 13:42:48 2011
@@ -0,0 +1,11 @@
+--- lighttpd-1.4.30/tests/LightyTest.pm~	2010-02-02 01:28:20.000000000 +0200
++++ lighttpd-1.4.30/tests/LightyTest.pm	2011-12-19 14:37:44.255526606 +0200
+@@ -43,7 +43,7 @@
+ 		$self->{MODULES_PATH} = $self->{BASEDIR}.'/build';
+ 	}
+ 	$self->{LIGHTTPD_PATH} = $self->{BINDIR}.'/lighttpd';
+-	$self->{PORT} = 2048;
++	$self->{PORT} = $ENV{LIGHTTPD_TEST_PORT} ? int($ENV{LIGHTTPD_TEST_PORT}) : 2048;
+ 
+ 	my ($name, $aliases, $addrtype, $net) = gethostbyaddr(inet_aton("127.0.0.1"), AF_INET);
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.352&r2=1.353&f=u