diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2010-11-10 17:08:23 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2010-11-10 17:08:23 +0000 |
| commit | 96b2f628f109da59028174d497d277e4f6a4fa39 (patch) | |
| tree | 16f7aeafc380e27118ac730a48a06451a40d9b85 /qpid/java/tools/bin | |
| parent | 56571be42e0eaa4d61ffe2e410436dc180d7458b (diff) | |
| download | qpid-python-96b2f628f109da59028174d497d277e4f6a4fa39.tar.gz | |
Fixed minor errors in the scripts
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1033592 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/tools/bin')
| -rwxr-xr-x | qpid/java/tools/bin/qpid-python-testkit | 6 | ||||
| -rw-r--r-- | qpid/java/tools/bin/set-testkit-env.sh | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/qpid/java/tools/bin/qpid-python-testkit b/qpid/java/tools/bin/qpid-python-testkit index 2c1d015281..cbe7972421 100755 --- a/qpid/java/tools/bin/qpid-python-testkit +++ b/qpid/java/tools/bin/qpid-python-testkit @@ -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 "$@" diff --git a/qpid/java/tools/bin/set-testkit-env.sh b/qpid/java/tools/bin/set-testkit-env.sh index e6a726eef1..051dad8179 100644 --- a/qpid/java/tools/bin/set-testkit-env.sh +++ b/qpid/java/tools/bin/set-testkit-env.sh @@ -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 |