zookeeper-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpeach <...@git.apache.org>
Subject [GitHub] zookeeper issue #565: ZOOKEEPER-3067: Optionally disable client environment ...
Date Fri, 13 Jul 2018 06:12:38 GMT
Github user jpeach commented on the issue:

    https://github.com/apache/zookeeper/pull/565
  
    Added a test. I needed the following patch to get the tests to build on Fedora 28:
    ```
    diff --git a/src/c/Makefile.am b/src/c/Makefile.am
    index a81e3da2..0230419b 100644
    --- a/src/c/Makefile.am
    +++ b/src/c/Makefile.am
    @@ -120,14 +120,14 @@ check_PROGRAMS = zktest-st
     TESTS_ENVIRONMENT = ZKROOT=${srcdir}/../.. \
                         CLASSPATH=$$CLASSPATH:$$CLOVER_HOME/lib/clover.jar
     nodist_zktest_st_SOURCES = $(TEST_SOURCES)
    -zktest_st_LDADD = libzkst.la libhashtable.la $(CPPUNIT_LIBS)
    +zktest_st_LDADD = libzkst.la libhashtable.la $(CPPUNIT_LIBS) -ldl
     zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS) $(USEIPV6) $(SOLARIS_CPPFLAGS)
     zktest_st_LDFLAGS = -shared $(SYMBOL_WRAPPERS) $(SOLARIS_LIB_LDFLAGS)
    
     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_LDADD = libzkmt.la libhashtable.la -lpthread $(CPPUNIT_LIBS) -ldl
       zktest_mt_CXXFLAGS = -DUSE_STATIC_LIB -DTHREADED $(CPPUNIT_CFLAGS) $(USEIPV6)
     if SOLARIS
       SHELL_SYMBOL_WRAPPERS_MT = cat ${srcdir}/tests/wrappers-mt.opt
    diff --git a/src/c/configure.ac b/src/c/configure.ac
    index 9811618d..e905aa4d 100644
    --- a/src/c/configure.ac
    +++ b/src/c/configure.ac
    @@ -34,7 +34,7 @@ if test "$with_cppunit" = "no" ; then
        CPPUNIT_INCLUDE=
        CPPUNIT_LIBS=
     else
    -   AM_PATH_CPPUNIT(1.10.2)
    +   PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes])
     fi
    
     if test "$CALLER" = "ANT" ; then
    @@ -52,6 +52,7 @@ AM_PROG_CC_C_O
     AC_PROG_CXX
     AC_PROG_INSTALL
     AC_PROG_LN_S
    +AM_PROG_AR
    
     # AC_DISABLE_SHARED
     AC_PROG_LIBTOOL
    ```


---

Mime
View raw message