r44313 - in /trunk/libembperl-perl: debian/patches/delay.patch debian/patches/series test.pl

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat Sep 19 15:34:20 2009
New Revision: 44313

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44313
Log:
split out next change into a patch

Added:
    trunk/libembperl-perl/debian/patches/delay.patch
Modified:
    trunk/libembperl-perl/debian/patches/series
    trunk/libembperl-perl/test.pl

Added: trunk/libembperl-perl/debian/patches/delay.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/delay.patch?rev=44313&op=file
==============================================================================
--- trunk/libembperl-perl/debian/patches/delay.patch (added)
+++ trunk/libembperl-perl/debian/patches/delay.patch Sat Sep 19 15:34:20 2009
@@ -1,0 +1,43 @@
+Description: Add additional delay loop to test.pl, for ridiculously slow machines
+ (like heavily loaded m68k/arm buildds)
+Author: Angus Lees <gus at debian.org>
+
+--- a/test.pl
++++ b/test.pl
+@@ -2685,6 +2685,7 @@
+ 	    }
+ 
+         my $tries = ($opt_gdb || $opt_ddd)?30:15 ;
++	my $delay = 1 ;
+         $httpdpid = 0 ;
+         my $herr = 0 ;
+ 
+@@ -2708,7 +2709,7 @@
+                     }
+                 }
+ 
+-            sleep (1) ;
++            sleep ($delay++) ;
+             }
+         close HERR if ($herr) ;
+ 
+@@ -2717,6 +2718,19 @@
+ 
+         print "pid = $httpdpid  ok\n" ;
+ 
++	# additional delay step for really slow machines (m68k/arm)
++	$tries = 0 ;
++	while ($tries++ < 8)
++	  {
++	    use IO::Socket::INET;
++	    my $sock = new IO::Socket::INET
++	      PeerAddr => $host,
++	      PeerPort => $port,
++	      Timeout => 10;
++	    last if $sock;	# connected successfully
++	    sleep(1.5**$tries);
++	  }
++
+ 	close ERR ;
+ 	if (!open (ERR, "$httpderr"))
+             {

Modified: trunk/libembperl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/series?rev=44313&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/patches/series (original)
+++ trunk/libembperl-perl/debian/patches/series Sat Sep 19 15:34:20 2009
@@ -2,3 +2,4 @@
 perl5.10.patch
 german.patch
 new_process_group.patch
+delay.patch

Modified: trunk/libembperl-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/test.pl?rev=44313&op=diff
==============================================================================
--- trunk/libembperl-perl/test.pl (original)
+++ trunk/libembperl-perl/test.pl Sat Sep 19 15:34:20 2009
@@ -2684,7 +2684,6 @@
 	    }
 
         my $tries = ($opt_gdb || $opt_ddd)?30:15 ;
-	my $delay = 1 ;
         $httpdpid = 0 ;
         my $herr = 0 ;
 
@@ -2708,7 +2707,7 @@
                     }
                 }
 
-            sleep ($delay++) ;
+            sleep (1) ;
             }
         close HERR if ($herr) ;
 
@@ -2716,19 +2715,6 @@
         die "Cannot open $tmppath/httpd.pid" if (!$httpdpid) ;
 
         print "pid = $httpdpid  ok\n" ;
-
-	# additional delay step for really slow machines (m68k/arm)
-	$tries = 0 ;
-	while ($tries++ < 8)
-	  {
-	    use IO::Socket::INET;
-	    my $sock = new IO::Socket::INET
-	      PeerAddr => $host,
-	      PeerPort => $port,
-	      Timeout => 10;
-	    last if $sock;	# connected successfully
-	    sleep(1.5**$tries);
-	  }
 
 	close ERR ;
 	if (!open (ERR, "$httpderr"))