ZOOKEEPER-420. build/test should not require install in zkpython

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@820808 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -57,13 +57,13 @@ BUGFIXES:
 
   ZOOKEEPER-501. CnxManagerTest failed on hudson. (flavio via mahadev)
   
-  ZOOKEEPER-499. electionAlg should default to FLE (3) - regression (phunt via
-  mahadev) 
+  ZOOKEEPER-499. electionAlg should default to FLE (3) - regression
+  (phunt via mahadev) 
 
   ZOOKEEPER-477. zkCleanup.sh is flaky (fernando via mahadev)
 
-  ZOOKEEPER-498. Unending Leader Elections : WAN configuration (flavio via
-  mahadev)
+  ZOOKEEPER-498. Unending Leader Elections : WAN configuration
+  (flavio via mahadev)
 
   ZOOKEEPER-508. proposals and commits for DIFF and Truncate messages from the
   leader to the followers is buggy. (mahadev and ben via mahadev)
@@ -76,6 +76,9 @@ BUGFIXES:
   ZOOKEEPER-535. ivy task does not enjoy being defined twice 
   (build error) (phunt via mahadev)
 
+  ZOOKEEPER-420. build/test should not require install in zkpython
+  (henry robinson via phunt)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
   "socket reuse" and failure to close client (phunt via mahadev)

src/contrib/zkpython/README

@@ -22,6 +22,12 @@ from zookeeper/src/contrib/zkpython/.
 
 To test, run ant test from the same directory. 
 
+You can compile the module without installing by running
+
+ant compile
+
+In order to use the module, zookeeper.so must be in your PYTHONPATH or in one of the directories referenced by sys.path. Running ant install should make sure that this is the case, but if you only run ant compile you probably need to add build/contrib/zkpython/* to PYTHONPATH to find the module. The C client libraries must be in a system library path, or LD_LIBRARY_PATH or DYLD_LIBRARY_PATH (Mac OS) for the module to work correctly, otherwise you will see a library not found error when trying to import the module. 
+
 NAMING CONVENTIONS:
 --------------------
 

src/contrib/zkpython/build.xml

@@ -27,7 +27,7 @@
   <property name="test.timeout" value="900000" />
 
   <target name="test"
-          depends="test-init,test-category,test-start,python-test,test-stop" />
+          depends="compile,test-init,test-category,test-start,python-test,test-stop" />
 	
     <target name="test-init" depends="checkMainCompiled">
         <delete dir="${test.log.dir}" />

src/contrib/zkpython/src/python/setup.py

@@ -23,7 +23,10 @@ zookeepermodule = Extension("zookeeper",
                             include_dirs=[zookeeper_basedir + "/src/c/include",
                                           zookeeper_basedir + "/src/c/generated"],
                             libraries=["zookeeper_mt"],
-                            library_dirs=["/usr/local/lib"])
+                            library_dirs=[zookeeper_basedir + "/src/c/.libs/",
+                                          zookeeper_basedir + "/build/test/test-cppunit/.libs",
+                                          "/usr/local/lib"
+                                          ])
 
 setup( name="ZooKeeper",
        version = "0.4",

src/contrib/zkpython/src/test/run_tests.sh

@@ -15,8 +15,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+# Find the build directory containing zookeeper.so
+SO_PATH=`find ../../../build/ -name "zookeeper.so" | head -1`
+PYTHONPATH=`dirname $SO_PATH`
+LIB_PATH=../../c/.libs/:../../../build/test/test-cppunit/.libs
 for test in `ls $1/*_test.py`; 
 do
     echo "Running $test"
-    python $test
-done
+    LD_LIBRARY_PATH=$LIB_PATH:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$LIB_PATH:$DYLD_LIBRARY_PATH PYTHONPATH=$PYTHONPATH python $test
+done