summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2008-05-14 21:51:28 +0000
committerAlan Conway <aconway@apache.org>2008-05-14 21:51:28 +0000
commit956ff8fed883d7cc4a2d1e945b1fe82a4de788ad (patch)
tree1e92735092ba69d002dd82150f92be0cc6d448cc
parentcc156604be043fea4a195198e8a9f6dcb7233a6f (diff)
downloadqpid-python-956ff8fed883d7cc4a2d1e945b1fe82a4de788ad.tar.gz
Python tests running in rpmbuild.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@656443 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/Makefile.am2
-rwxr-xr-xqpid/cpp/src/tests/python_tests2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/Makefile.am b/qpid/cpp/Makefile.am
index a97020c701..7d128e557b 100644
--- a/qpid/cpp/Makefile.am
+++ b/qpid/cpp/Makefile.am
@@ -30,7 +30,7 @@ clean-local:
rpmbuild: $(SPEC) dist-gzip
mkdir -p $(RPMDIRS)
- rpmbuild $(RPMMACROS) $(RPMOPTS) $(SPEC)
+ QPID_PYTHON_DIR=$(abs_top_srcdir)/../python rpmbuild $(RPMMACROS) $(RPMOPTS) $(SPEC)
if HAS_RPMLINT
rpmlint `find rpm -name '*.rpm'`
else
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index e4b70f5ff5..553c5f4cdb 100755
--- a/qpid/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
@@ -3,7 +3,7 @@
QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
MY_DIR=$(dirname $(which $0))
-PYTHON_DIR=${MY_DIR}/../../../python
+PYTHON_DIR=${QPID_PYTHON_DIR:-${MY_DIR}/../../../python}
run() {
SPEC=$1