From bea2d48925e3d2d72aab1f6666e4770e2b44487e Mon Sep 17 00:00:00 2001 From: Patrick Hunt Date: Tue, 18 Jun 2019 18:08:46 -0700 Subject: [PATCH] ZOOKEEPER-3433 zkpython build broken after maven migration Fixed the build and test infrastructure for zkpython. Verified the build and tests all passing under both ubuntu and macos. Change-Id: I3c80774a2712f280d1f14739d1eb78baa066fdc6 --- .../zookeeper-contrib-zkpython/src/python/setup.py | 4 ++-- .../zookeeper-contrib-zkpython/src/test/run_tests.sh | 4 ++-- .../zookeeper-contrib-zkpython/src/test/zkServer.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py index d9fa36ba107..c64889e0312 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py @@ -16,10 +16,10 @@ from distutils.core import setup, Extension -zookeeper_basedir = "../../../" +zookeeper_basedir = "../../" zookeepermodule = Extension("zookeeper", - sources=["zookeeper-client/zookeeper-client-c/zookeeper.c"], + sources=["src/c/zookeeper.c"], include_dirs=[zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/include", zookeeper_basedir + "/build/c", zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/generated"], diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh index 18d924085d4..91e5b57d2f0 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh @@ -30,9 +30,9 @@ else fi # Find the build directory containing zookeeper.so -SO_PATH=`find ../../../build/ -name "zookeeper.so" | head -1` +SO_PATH=`find ../../build/ -name "zookeeper.so" | head -1` PYTHONPATH=`dirname $SO_PATH` -LIB_PATH=../../c/.libs/:../../../build/test/test-cppunit/.libs +LIB_PATH=../../build/c/.libs/:../../build/test/test-cppunit/.libs for test in `ls $1/*_test.py`; do echo "Running $test" diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh index 74ead8cba18..a4638de3f31 100755 --- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh +++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh @@ -34,7 +34,7 @@ fi if [ "x${base_dir}" == "x" ] then -zk_base="../../../" +zk_base="../../" else zk_base="${base_dir}" fi