You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2010/11/10 18:08:24 UTC

svn commit: r1033592 - in /qpid/trunk/qpid/java/tools/bin: qpid-python-testkit set-testkit-env.sh

Author: rajith
Date: Wed Nov 10 17:08:23 2010
New Revision: 1033592

URL: http://svn.apache.org/viewvc?rev=1033592&view=rev
Log:
Fixed minor errors in the scripts

Modified:
    qpid/trunk/qpid/java/tools/bin/qpid-python-testkit
    qpid/trunk/qpid/java/tools/bin/set-testkit-env.sh

Modified: qpid/trunk/qpid/java/tools/bin/qpid-python-testkit
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/bin/qpid-python-testkit?rev=1033592&r1=1033591&r2=1033592&view=diff
==============================================================================
--- qpid/trunk/qpid/java/tools/bin/qpid-python-testkit (original)
+++ qpid/trunk/qpid/java/tools/bin/qpid-python-testkit Wed Nov 10 17:08:23 2010
@@ -22,9 +22,9 @@
 # via the python test runner. The defaults are set for a running
 # from an svn checkout
 
-. ./setenv.sh
+. ./set-testkit-env.sh
 
-export PYTHONPATH=../:$PYTHONPATH
+export PYTHONPATH=./:$PYTHONPATH
 rm -rf $OUTDIR
-$PYTHON_DIR/qpid-python-test -DOUTDIR=$OUTDIR  -m testkit "$@"
+qpid-python-test -DOUTDIR=$OUTDIR  -m testkit "$@"
 

Modified: qpid/trunk/qpid/java/tools/bin/set-testkit-env.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/bin/set-testkit-env.sh?rev=1033592&r1=1033591&r2=1033592&view=diff
==============================================================================
--- qpid/trunk/qpid/java/tools/bin/set-testkit-env.sh (original)
+++ qpid/trunk/qpid/java/tools/bin/set-testkit-env.sh Wed Nov 10 17:08:23 2010
@@ -62,11 +62,11 @@ fi
 
 if [ "$STORE_LIB" = "" ] ; then
    if [ -e /usr/lib64/qpid/daemon/msgstore.so ] ; then
-      CLUSTER_LIB="/usr/lib64/qpid/daemon/msgstore.so"
+      STORE_LIB="/usr/lib64/qpid/daemon/msgstore.so"
    elif [ -e /usr/lib/qpid/daemon/msgstore.so ] ; then
-      CLUSTER_LIB="/usr/lib/qpid/daemon/msgstore.so"
-   else
-     echo "WARNING: skipping test, STORE_LIB not set and msgstore.so not found."; exit 0;
+      STORE_LIB="/usr/lib/qpid/daemon/msgstore.so"
+   #else
+   #  echo "WARNING: skipping test, STORE_LIB not set and msgstore.so not found."; exit 0;
    fi
 fi   
 
@@ -82,7 +82,7 @@ if [ "$QP_CP" = "" ] ; then
 fi
 
 if [ "$OUTDIR" = "" ] ; then
-   OUTDIR=`abs_path "../output"`
+   OUTDIR=`abs_path "./output"`
 fi
 
 export PYTHONPATH PYTHON_DIR QPIDD_EXEC CLUSTER_LIB QP_CP OUTDIR



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org