qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r885759 - in /qpid/trunk/qpid/cpp/src/tests: python_tests test_env.sh.in
Date Tue, 01 Dec 2009 13:28:30 GMT
Author: aconway
Date: Tue Dec  1 13:28:29 2009
New Revision: 885759

URL: http://svn.apache.org/viewvc?rev=885759&view=rev
Log:
Fix problem with make distcheck - python tests not being skipped when python absent.

Modified:
    qpid/trunk/qpid/cpp/src/tests/python_tests
    qpid/trunk/qpid/cpp/src/tests/test_env.sh.in

Modified: qpid/trunk/qpid/cpp/src/tests/python_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/python_tests?rev=885759&r1=885758&r2=885759&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/python_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/python_tests Tue Dec  1 13:28:29 2009
@@ -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}

Modified: qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_env.sh.in?rev=885759&r1=885758&r2=885759&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_env.sh.in Tue Dec  1 13:28:29 2009
@@ -28,30 +28,24 @@
 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
 



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


Mime
View raw message