diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-11-12 21:22:24 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-11-12 21:22:24 +0000 |
| commit | 780a3211d2b7a098455a6d8ec00067e6958119ba (patch) | |
| tree | 1a8922d6e23fa3141dc8555de17a7cc8bc59c6ee /qpid/cpp/src/tests/legacystore | |
| parent | 0630ea05003e6c530b9dde889e8296b12e67e41b (diff) | |
| download | qpid-python-780a3211d2b7a098455a6d8ec00067e6958119ba.tar.gz | |
QPID-5330: Simplify testing for presence of python testing code -
this makes it much easier not to call the python testing code
when it isn't available
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1541241 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/legacystore')
| -rw-r--r-- | qpid/cpp/src/tests/legacystore/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/legacystore/run_python_tests | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/legacystore/CMakeLists.txt b/qpid/cpp/src/tests/legacystore/CMakeLists.txt index 3ad02ac548..85cc4be5c7 100644 --- a/qpid/cpp/src/tests/legacystore/CMakeLists.txt +++ b/qpid/cpp/src/tests/legacystore/CMakeLists.txt @@ -152,6 +152,6 @@ target_link_libraries (jtt add_test(journal_jtt ${CMAKE_CURRENT_BINARY_DIR}/jtt -c ${CMAKE_CURRENT_SOURCE_DIR}/jrnl/jtt/jtt.csv) -add_test (legacystore_python_tests ${shell} ${CMAKE_CURRENT_SOURCE_DIR}/run_python_tests${test_script_suffix}) +add_test (legacystore_python_tests ${test_wrap} -- ${CMAKE_CURRENT_SOURCE_DIR}/run_python_tests${test_script_suffix}) endif (BUILD_LEGACYSTORE AND BUILD_TESTING) diff --git a/qpid/cpp/src/tests/legacystore/run_python_tests b/qpid/cpp/src/tests/legacystore/run_python_tests index 130dee05f8..79dbd35da5 100755 --- a/qpid/cpp/src/tests/legacystore/run_python_tests +++ b/qpid/cpp/src/tests/legacystore/run_python_tests @@ -18,7 +18,9 @@ # under the License. # -source ../test_env.sh +source $QPID_TEST_COMMON + +ensure_python_tests #Add our directory to the python path export PYTHONPATH=$srcdir/legacystore:$PYTHONPATH @@ -27,7 +29,6 @@ MODULENAME=python_tests echo "Running Python tests in module ${MODULENAME}..." -test -d $PYTHON_DIR || { echo "Skipping python tests, no python dir."; exit 0; } QPID_PORT=${QPID_PORT:-5672} FAILING=${FAILING:-/dev/null} PYTHON_TESTS=${PYTHON_TESTS:-$*} |