diff --git a/memcached-fix_test.patch b/memcached-fix_test.patch new file mode 100644 index 0000000..20f22e6 --- /dev/null +++ b/memcached-fix_test.patch @@ -0,0 +1,32 @@ +From b2b574ae46454d7016012bf8b40a2d24cd723e60 Mon Sep 17 00:00:00 2001 +From: dormando +Date: Fri, 10 Aug 2018 15:31:22 -0700 +Subject: [PATCH] t/lru-maintainer.t: check for WARM item earlier + +item might get pushed back out as we keep doing work. +--- + t/lru-maintainer.t | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/t/lru-maintainer.t b/t/lru-maintainer.t +index 04fa76ac6..adacd1b48 100644 +--- a/t/lru-maintainer.t ++++ b/t/lru-maintainer.t +@@ -68,6 +68,8 @@ for (my $key = 0; $key < 100; $key++) { + } + last; + } ++ my $istats = mem_stats($sock, "items"); ++ isnt($istats->{"items:31:number_warm"}, 0, "our canary moved to warm"); + } + print $sock "set key$key 0 0 66560\r\n$value\r\n"; + is(scalar <$sock>, "STORED\r\n", "stored key$key"); +@@ -76,8 +78,6 @@ for (my $key = 0; $key < 100; $key++) { + { + my $stats = mem_stats($sock); + isnt($stats->{evictions}, 0, "some evictions happened"); +- my $istats = mem_stats($sock, "items"); +- isnt($istats->{"items:31:number_warm"}, 0, "our canary moved to warm"); + use Data::Dumper qw/Dumper/; + } + diff --git a/memcached.changes b/memcached.changes index 9e9b882..a0461c2 100644 --- a/memcached.changes +++ b/memcached.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 3 11:52:39 UTC 2018 - Guillaume GARDET + +- Add patch to fix aarch64, ppc64* and s390x tests: + * memcached-fix_test.patch + ------------------------------------------------------------------- Fri Aug 17 15:15:38 UTC 2018 - nicolas.bock@suse.com diff --git a/memcached.spec b/memcached.spec index e735def..23cd0ad 100644 --- a/memcached.spec +++ b/memcached.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -35,6 +35,7 @@ Source4: memcached.service Patch0: memcached-1.4.5.dif Patch1: memcached-autofoo.patch Patch2: memcached-use-endian_h.patch +Patch3: memcached-fix_test.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cyrus-sasl-devel @@ -82,6 +83,7 @@ This package contains development files %patch0 %patch1 %patch2 +%patch3 -p1 %build autoreconf -fi