Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org Received: (qmail 23740 invoked from network); 8 Apr 2010 18:23:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Apr 2010 18:23:11 -0000 Received: (qmail 52422 invoked by uid 500); 8 Apr 2010 18:23:11 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 52389 invoked by uid 500); 8 Apr 2010 18:23:11 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 52381 invoked by uid 99); 8 Apr 2010 18:23:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 18:23:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 18:23:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E460A238896F; Thu, 8 Apr 2010 18:22:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r932049 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/Makefile.am src/c/configure.ac src/c/tests/TestClient.cc Date: Thu, 08 Apr 2010 18:22:45 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100408182245.E460A238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Thu Apr 8 18:22:45 2010 New Revision: 932049 URL: http://svn.apache.org/viewvc?rev=932049&view=rev Log: ZOOKEEPER-735. cppunit test testipv6 assumes that the machine is ipv6 enabled. (mahadev) Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/Makefile.am hadoop/zookeeper/trunk/src/c/configure.ac hadoop/zookeeper/trunk/src/c/tests/TestClient.cc Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=932049&r1=932048&r2=932049&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Thu Apr 8 18:22:45 2010 @@ -8,6 +8,9 @@ Backward compatible changes: BUGFIXES: + ZOOKEEPER-735. cppunit test testipv6 assumes that the machine is ipv6 + enabled. (mahadev) + IMPROVEMENTS: ZOOKEEPER-724. Improve junit test integration - log harness information (phunt via mahadev) Modified: hadoop/zookeeper/trunk/src/c/Makefile.am URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/Makefile.am?rev=932049&r1=932048&r2=932049&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/Makefile.am (original) +++ hadoop/zookeeper/trunk/src/c/Makefile.am Thu Apr 8 18:22:45 2010 @@ -3,7 +3,7 @@ include $(top_srcdir)/aminclude.am AM_CPPFLAGS = -I${srcdir}/include -I${srcdir}/tests -I${srcdir}/generated AM_CFLAGS = -Wall -Werror -CXXFLAGS = -Wall -g +CXXFLAGS = -Wall -g $(USEIPV6) LIB_LDFLAGS = -no-undefined -version-info 2 @@ -83,14 +83,14 @@ SYMBOL_WRAPPERS=$(shell cat ${srcdir}/te check_PROGRAMS = zktest-st nodist_zktest_st_SOURCES = $(TEST_SOURCES) zktest_st_LDADD = libzkst.la libhashtable.la $(CPPUNIT_LIBS) -zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS) +zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS) $(USEIPV6) zktest_st_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS) if WANT_SYNCAPI check_PROGRAMS += zktest-mt nodist_zktest_mt_SOURCES = $(TEST_SOURCES) tests/PthreadMocks.cc zktest_mt_LDADD = libzkmt.la libhashtable.la -lpthread $(CPPUNIT_LIBS) - zktest_mt_CXXFLAGS = -DUSE_STATIC_LIB -DTHREADED $(CPPUNIT_CFLAGS) + zktest_mt_CXXFLAGS = -DUSE_STATIC_LIB -DTHREADED $(CPPUNIT_CFLAGS) $(USEIPV6) SYMBOL_WRAPPERS_MT=$(SYMBOL_WRAPPERS) $(shell cat ${srcdir}/tests/wrappers-mt.opt) zktest_mt_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS_MT) endif Modified: hadoop/zookeeper/trunk/src/c/configure.ac URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/configure.ac?rev=932049&r1=932048&r2=932049&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/configure.ac (original) +++ hadoop/zookeeper/trunk/src/c/configure.ac Thu Apr 8 18:22:45 2010 @@ -92,6 +92,30 @@ AC_CHECK_TYPE([nfds_t], [AC_DEFINE([POLL_NFDS_TYPE],[unsigned int],[poll() second argument type])], [#include ]) +AC_MSG_CHECKING([whether to enable ipv6]) + +AC_TRY_RUN([ /* is AF_INET6 available? */ +#include +#include +main() +{ + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); + else + exit(0); +} +], AC_MSG_RESULT(yes) + ipv6=yes, + AC_MSG_RESULT(no) + ipv6=no, + AC_MSG_RESULT(no) + ipv6=no) + +if test x"$ipv6" = xyes; then + USEIPV6="-DZOO_IPV6_ENABLED" + AC_SUBST(USEIPV6) +fi + # Checks for library functions. AC_CHECK_FUNCS([getcwd gethostbyname gethostname getlogin getpwuid_r gettimeofday getuid memmove memset poll socket strchr strdup strerror strtol]) Modified: hadoop/zookeeper/trunk/src/c/tests/TestClient.cc URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/tests/TestClient.cc?rev=932049&r1=932048&r2=932049&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/tests/TestClient.cc (original) +++ hadoop/zookeeper/trunk/src/c/tests/TestClient.cc Thu Apr 8 18:22:45 2010 @@ -188,7 +188,9 @@ class Zookeeper_simpleSystem : public CP CPPUNIT_TEST(testDeserializeString); #ifdef THREADED CPPUNIT_TEST(testNullData); +#ifdef ZOO_IPV6_ENABLED CPPUNIT_TEST(testIPV6); +#endif CPPUNIT_TEST(testPath); CPPUNIT_TEST(testPathValidation); CPPUNIT_TEST(testPing);