Author: phunt
Date: Thu Nov 19 22:05:19 2009
New Revision: 882319

URL: http://svn.apache.org/viewvc?rev=882319&view=rev
Log:
ZOOKEEPER-420. build/test should not require install in zkpython

Modified:
    hadoop/zookeeper/branches/branch-3.2/CHANGES.txt
    hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/README
    hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/build.xml
    
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/python/setup.py
    
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/test/run_tests.sh

Modified: hadoop/zookeeper/branches/branch-3.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/CHANGES.txt?rev=882319&r1=882318&r2=882319&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.2/CHANGES.txt (original)
+++ hadoop/zookeeper/branches/branch-3.2/CHANGES.txt Thu Nov 19 22:05:19 2009
@@ -1,3 +1,20 @@
+Release 3.2.2 - 2009-11-24
+
+Backward compatible changes:
+
+BUGFIXES:
+
+  ZOOKEEPER-420. build/test should not require install in zkpython
+  (henry robinson via phunt)
+
+  ZOOKEEPER-562. c client can flood server with pings if tcp send queue
+  filled. (ben reed via mahadev)
+
+  ZOOKEEPER-547. Sanity check in QuorumCnxn Manager and quorum communication 
port.
+  (mahadev via breed)
+
+
+
 Release 3.2.1 - 2009-08-27
 
 Backward compatible changes:

Modified: hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/README
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/README?rev=882319&r1=882318&r2=882319&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/README (original)
+++ hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/README Thu Nov 19 
22:05:19 2009
@@ -22,6 +22,12 @@
 
 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:
 --------------------
 

Modified: hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/build.xml?rev=882319&r1=882318&r2=882319&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/build.xml 
(original)
+++ hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/build.xml Thu Nov 
19 22:05:19 2009
@@ -36,7 +36,7 @@
 
 
   <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}" />

Modified: 
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/python/setup.py
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/python/setup.py?rev=882319&r1=882318&r2=882319&view=diff
==============================================================================
--- 
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/python/setup.py 
(original)
+++ 
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/python/setup.py 
Thu Nov 19 22:05:19 2009
@@ -23,7 +23,10 @@
                             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",

Modified: 
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/test/run_tests.sh
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/test/run_tests.sh?rev=882319&r1=882318&r2=882319&view=diff
==============================================================================
--- 
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/test/run_tests.sh 
(original)
+++ 
hadoop/zookeeper/branches/branch-3.2/src/contrib/zkpython/src/test/run_tests.sh 
Thu Nov 19 22:05:19 2009
@@ -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
\ No newline at end of file
+    LD_LIBRARY_PATH=$LIB_PATH:$LD_LIBRARY_PATH 
DYLD_LIBRARY_PATH=$LIB_PATH:$DYLD_LIBRARY_PATH PYTHONPATH=$PYTHONPATH python 
$test
+done


Reply via email to