[libmemcached] - update to 1.0.16 - ignore test result for memaslap (XFAIL but PASS) https://bugs.launchpad.net/lib

Remi Collet remi at fedoraproject.org
Mon Feb 4 16:03:57 UTC 2013


commit 579bb502722c7597764c9721e571f62b181191f3
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Feb 4 17:03:49 2013 +0100

    - update to 1.0.16
    - ignore test result for memaslap (XFAIL but PASS) https://bugs.launchpad.net/libmemcached/+bug/1115357

 .gitignore        |    4 +++-
 libmemcached.spec |   24 +++++++++++++++---------
 sources           |    2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1502c76..c0d8d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-*~
+clog
+*spec~
 /libmemcached-0.49-exhsieh.tar.gz
 /libmemcached-0.51-exhsieh.tar.gz
 /libmemcached-0.52-exhsieh.tar.gz
@@ -13,3 +14,4 @@
 /libmemcached-1.0.13-exhsieh.tar.gz
 /libmemcached-1.0.14-exhsieh.tar.gz
 /libmemcached-1.0.15-exhsieh.tar.gz
+/libmemcached-1.0.16-exhsieh.tar.gz
diff --git a/libmemcached.spec b/libmemcached.spec
index 9190a78..b81ce74 100644
--- a/libmemcached.spec
+++ b/libmemcached.spec
@@ -4,7 +4,7 @@
 
 Name:      libmemcached
 Summary:   Client library and command line tools for memcached server
-Version:   1.0.15
+Version:   1.0.16
 Release:   1%{?dist}
 License:   BSD
 Group:     System Environment/Libraries
@@ -75,15 +75,8 @@ you will need to install %{name}-devel.
 mkdir examples
 cp -p tests/*.{cc,h} examples/
 
-# https://bugs.launchpad.net/libmemcached/+bug/1094413
-sed -e s/LIBEVENT_LDFLAGS/LIBEVENT_LIB/ \
-    -i Makefile.in
-
 
 %build
-# https://bugs.launchpad.net/libmemcached/+bug/1094414
-export CFLAGS="$RPM_OPT_FLAGS  -std=c99"
-
 # option --with-memcached=false to disable server binary check (as we don't run test)
 %configure \
 %if %{runselftest}
@@ -125,7 +118,15 @@ fi
 
 %check
 %if %{runselftest}
-make test
+make test 2>&1 | tee rpmtests.log
+# Ignore test result for memaslap (XFAIL but PASS)
+# https://bugs.launchpad.net/libmemcached/+bug/1115357
+if grep "XPASS: clients/memaslap" rpmtests.log && grep "1 of 21" rpmtests.log
+then
+  exit 0
+else
+  exit 1
+fi
 %endif
 
 
@@ -173,6 +174,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb  4 2013 Remi Collet <remi at fedoraproject.org> - 1.0.16-1
+- update to 1.0.16
+- ignore test result for memaslap (XFAIL but PASS)
+  https://bugs.launchpad.net/libmemcached/+bug/1115357
+
 * Sat Dec 29 2012 Remi Collet <remi at fedoraproject.org> - 1.0.15-1
 - update to 1.0.15
 - libmemcachedprotocol is back
diff --git a/sources b/sources
index c4fe4fe..203f265 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2f6eaf5f2bba22dfed945b2e2d27b9d5  libmemcached-1.0.15-exhsieh.tar.gz
+3cc0390d7e73386f24fae23046cad3fc  libmemcached-1.0.16-exhsieh.tar.gz


More information about the scm-commits mailing list