Author: phunt
Date: Thu Oct 17 17:08:27 2013
New Revision: 1533162
URL: http://svn.apache.org/r1533162
Log:
ZOOKEEPER-1646. mt c client tests fail on Ubuntu Raring (phunt)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/c/tests/LibCMocks.cc
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1533162&r1=1533161&r2=1533162&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Thu Oct 17 17:08:27 2013
@@ -133,6 +133,8 @@ BUGFIXES:
ZOOKEEPER-1610. Some classes are using == or != to compare
Long/String objects instead of .equals() (Edward Ribeiro via phunt)
+ ZOOKEEPER-1646. mt c client tests fail on Ubuntu Raring (phunt)
+
IMPROVEMENTS:
ZOOKEEPER-1564. Allow JUnit test build with IBM Java
Modified: zookeeper/branches/branch-3.4/src/c/tests/LibCMocks.cc
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/tests/LibCMocks.cc?rev=1533162&r1=1533161&r2=1533162&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/tests/LibCMocks.cc (original)
+++ zookeeper/branches/branch-3.4/src/c/tests/LibCMocks.cc Thu Oct 17 17:08:27
2013
@@ -310,6 +310,17 @@ int poll(struct pollfd *fds, POLL_NFDS_T
}
+/*
+ * Recent gcc with -O2 and glibc FORTIFY feature may cause our poll
+ * mock to be ignored.
+ */
+#if __USE_FORTIFY_LEVEL > 0
+int __poll_chk (struct pollfd *__fds, nfds_t __nfds, int __timeout,
+ __SIZE_TYPE__ __fdslen) {
+ return poll(__fds, __nfds, __timeout);
+}
+#endif
+
//
*****************************************************************************
// gettimeofday
int gettimeofday(struct timeval *tp, GETTIMEOFDAY_ARG2_TYPE tzp){
