diff options
| author | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2011-10-21 01:19:00 +0000 |
| commit | ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 (patch) | |
| tree | dcfb94e75656c6c239fc3dcb754cd2015126424d /java/tools/bin/qpid-python-testkit | |
| parent | 5eb354b338bb8d8fcd35b6ac3fb33f8103e757c3 (diff) | |
| download | qpid-python-ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5.tar.gz | |
Undo bad merge from trunk - merged at wrong level.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/tools/bin/qpid-python-testkit')
| -rwxr-xr-x | java/tools/bin/qpid-python-testkit | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/tools/bin/qpid-python-testkit b/java/tools/bin/qpid-python-testkit index 7233d0d075..cbe7972421 100755 --- a/java/tools/bin/qpid-python-testkit +++ b/java/tools/bin/qpid-python-testkit @@ -22,12 +22,9 @@ # via the python test runner. The defaults are set for a running # from an svn checkout -. check-qpid-java-env +. ./set-testkit-env.sh export PYTHONPATH=./:$PYTHONPATH -echo $PYTHONPATH -if [ "$OUTDIR" = "" ] ; then - OUTDIR=$PWD -fi -testdir=$OUTDIR/testkit-out-`date +%F-%H-%M-%S` -qpid-python-test -m testkit -DOUTDIR=$testdir"$@" +rm -rf $OUTDIR +qpid-python-test -DOUTDIR=$OUTDIR -m testkit "$@" + |