[csw-devel] SF.net SVN: gar:[13547] csw/mgar/pkg/memcached/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13547
          http://gar.svn.sourceforge.net/gar/?rev=13547&view=rev
Author:   dmichelsen
Date:     2011-03-03 19:55:02 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
memcached: Small sanitazions

Modified Paths:
--------------
    csw/mgar/pkg/memcached/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch

Removed Paths:
-------------
    csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch

Modified: csw/mgar/pkg/memcached/trunk/Makefile
===================================================================
--- csw/mgar/pkg/memcached/trunk/Makefile	2011-03-03 13:26:16 UTC (rev 13546)
+++ csw/mgar/pkg/memcached/trunk/Makefile	2011-03-03 19:55:02 UTC (rev 13547)
@@ -17,7 +17,9 @@
 PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch
 PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch
 
-PATCHFILES += 0001-Make-sure-to-wait-for-data.patch
+# The addition of more status field made the data arrive in multiple packets
+# leading to broken tests when it is not waited for more packages.
+PATCHFILES += 0003-Make-sure-to-wait-for-data.patch
 
 # If we enable GIT patching this makes a .git repo in $WORKSRC.
 # Unfortunatly this triggers maintainer mode for t/whitespace.t which
@@ -46,11 +48,5 @@
 CONFIGURE_ARGS-sol5.10 += --enable-dtrace
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL))
 
-# From Trond Norbye:
-# The 101 test is a "bogus" test (it is there to prove that a deadlock is in the
-# client and not in the memcached server) and it will suck up all resources on the box...
-#SKIP_TEST_101 = 1
-#EXTRA_TEST_EXPORTS = SKIP_TEST_101
-
 include gar/category.mk
 

Deleted: csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch
===================================================================
--- csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch	2011-03-03 13:26:16 UTC (rev 13546)
+++ csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch	2011-03-03 19:55:02 UTC (rev 13547)
@@ -1,29 +0,0 @@
-From 393936cffd43bd2070c902f55b88dbde9e4c56f4 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 4 Feb 2011 16:58:41 +0100
-Subject: [PATCH] Make sure to wait for data
-
----
- t/binary.t |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/t/binary.t b/t/binary.t
-index 1108b8e..de7555e 100755
---- a/t/binary.t
-+++ b/t/binary.t
-@@ -535,7 +535,11 @@ sub _handle_single_response {
-     my $self = shift;
-     my $myopaque = shift;
- 
--    $self->{socket}->recv(my $response, ::MIN_RECV_BYTES);
-+    my $response;
-+    do {
-+      $self->{socket}->recv(my $lresponse, ::MIN_RECV_BYTES);
-+      $response .= $lresponse;
-+    } while( length($response) < ::MIN_RECV_BYTES );
-     Test::More::is(length($response), ::MIN_RECV_BYTES, "Expected read length");
- 
-     my ($magic, $cmd, $keylen, $extralen, $datatype, $status, $remaining,
--- 
-1.7.3.2
-

Copied: csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch (from rev 13545, csw/mgar/pkg/memcached/trunk/files/0001-Make-sure-to-wait-for-data.patch)
===================================================================
--- csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch	                        (rev 0)
+++ csw/mgar/pkg/memcached/trunk/files/0003-Make-sure-to-wait-for-data.patch	2011-03-03 19:55:02 UTC (rev 13547)
@@ -0,0 +1,29 @@
+From 393936cffd43bd2070c902f55b88dbde9e4c56f4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 4 Feb 2011 16:58:41 +0100
+Subject: [PATCH] Make sure to wait for data
+
+---
+ t/binary.t |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/t/binary.t b/t/binary.t
+index 1108b8e..de7555e 100755
+--- a/t/binary.t
++++ b/t/binary.t
+@@ -535,7 +535,11 @@ sub _handle_single_response {
+     my $self = shift;
+     my $myopaque = shift;
+ 
+-    $self->{socket}->recv(my $response, ::MIN_RECV_BYTES);
++    my $response;
++    do {
++      $self->{socket}->recv(my $lresponse, ::MIN_RECV_BYTES);
++      $response .= $lresponse;
++    } while( length($response) < ::MIN_RECV_BYTES );
+     Test::More::is(length($response), ::MIN_RECV_BYTES, "Expected read length");
+ 
+     my ($magic, $cmd, $keylen, $extralen, $datatype, $status, $remaining,
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.