diff options
| author | Alan Conway <aconway@apache.org> | 2009-12-01 13:28:29 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-12-01 13:28:29 +0000 |
| commit | ec150948e1dbf6279c68cbcdc3289c20e8024a43 (patch) | |
| tree | b7dacbf26ca6c1b424f2177110ccec1fe224598b /qpid/cpp | |
| parent | beffd788a95c09728bd47a5e2f39844d3f9b3e8b (diff) | |
| download | qpid-python-ec150948e1dbf6279c68cbcdc3289c20e8024a43.tar.gz | |
Fix problem with make distcheck - python tests not being skipped when python absent.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@885759 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rwxr-xr-x | qpid/cpp/src/tests/python_tests | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/test_env.sh.in | 26 |
2 files changed, 11 insertions, 16 deletions
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests index b82123b5bd..51c808a6c9 100755 --- a/qpid/cpp/src/tests/python_tests +++ b/qpid/cpp/src/tests/python_tests @@ -21,6 +21,7 @@ # Run the python tests. source ./test_env.sh +test -d $PYTHON_DIR || { echo "Skipping python tests, no python dir."; exit 0; } QPID_PORT=${QPID_PORT:-5672} PYTHON_TESTS=${PYTHON_TESTS:-$*} FAILING=${FAILING:-/dev/null} diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in index 76efc97217..0b4520ac4a 100644 --- a/qpid/cpp/src/tests/test_env.sh.in +++ b/qpid/cpp/src/tests/test_env.sh.in @@ -28,30 +28,24 @@ export top_builddir=@abs_top_builddir@ export QPID_MODULE_DIR=$top_builddir/src@builddir_lib_suffix@ export QPID_TEST_MODULE_DIR=$builddir@builddir_lib_suffix@ -# Other paths and directories -if test -d $builddir/python ; then - export PYTHON_DIR=$builddir/python - export QPID_PYTHON_TEST=$PYTHON_DIR/commands/qpid-python-test -elif test -d $top_srcdir/../python ; then +# Python paths and directories +export PYTHON_DIR=$builddir/python +export QPID_PYTHON_TEST=$PYTHON_DIR/commands/qpid-python-test +if [ ! -d $PYTHON_DIR -a -d $top_srcdir/../python ]; then export PYTHON_DIR=$top_srcdir/../python export QPID_PYTHON_TEST=$PYTHON_DIR/qpid-python-test fi -if test -d $PYTHON_DIR; then - export PYTHON_COMMANDS=$PYTHON_DIR/commands - export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$PYTHONPATH -fi - -export QPID_TEST_EXEC_DIR=$builddir - -# qpidd executable -export QPIDD_EXEC=$top_builddir/src/qpidd - -# Executable python scripts +export PYTHON_COMMANDS=$PYTHON_DIR/commands +export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$PYTHONPATH export QPID_CONFIG_EXEC=$PYTHON_COMMANDS/qpid-config export QPID_ROUTE_EXEC=$PYTHON_COMMANDS/qpid-route export QPID_CLUSTER_EXEC=$PYTHON_COMMANDS/qpid-cluster +# qpidd executable +export QPIDD_EXEC=$top_builddir/src/qpidd + # Test executables +export QPID_TEST_EXEC_DIR=$builddir export RECEIVER_EXEC=$QPID_TEST_EXEC_DIR/receiver export SENDER_EXEC=$QPID_TEST_EXEC_DIR/sender |