Repository: qpid-proton Updated Branches: refs/heads/examples a55a53d98 -> 51a757bc4
NO-JIRA: If we didn't build the python bindings then we can't run python tests git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1628509 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5d32449f Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5d32449f Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5d32449f Branch: refs/heads/examples Commit: 5d32449f69f8d19feafc74471cd1608fdb9c1d7b Parents: b32cb18 Author: Andrew Stitcher <astitc...@apache.org> Authored: Tue Sep 30 18:17:07 2014 +0000 Committer: Andrew Stitcher <astitc...@apache.org> Committed: Tue Sep 30 18:17:07 2014 +0000 ---------------------------------------------------------------------- proton-c/CMakeLists.txt | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5d32449f/proton-c/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt index e5f02ad..6b6b730 100644 --- a/proton-c/CMakeLists.txt +++ b/proton-c/CMakeLists.txt @@ -484,21 +484,23 @@ mark_as_advanced (VALGRIND_EXE) add_subdirectory(src/tests) # python test: tests/python/proton-test -set (py_root "${pn_test_root}/python") -set (py_src "${CMAKE_CURRENT_SOURCE_DIR}/bindings/python") -set (py_bin "${CMAKE_CURRENT_BINARY_DIR}/bindings/python") -set (py_bld "${CMAKE_CURRENT_BINARY_DIR}${bld_suffix}") # For windows -set (app_path "${pn_test_bin}/tools/apps/c${bld_suffix}") -set (app_path "${app_path}:${pn_test_root}/tools/apps/python") -set_path (py_path "${py_bin}:${py_bld}:${app_path}:$ENV{PATH}") -set_path (py_pythonpath "${py_root}:${py_src}:${py_bin}:${py_bld}|$ENV{PYTHONPATH}") -if (CMAKE_SYSTEM_NAME STREQUAL Windows) - set_path (py_pythonpath "${py_bin}${bld_suffix}:${py_pythonpath}") -endif (CMAKE_SYSTEM_NAME STREQUAL Windows) -add_test (python-test ${PYTHON_EXECUTABLE} ${env_py} - "PATH=${py_path}" "PYTHONPATH=${py_pythonpath}" ${VALGRIND_ENV} - ${PYTHON_EXECUTABLE} "${py_root}/proton-test") -set_tests_properties(python-test PROPERTIES PASS_REGULAR_EXPRESSION "Totals: .* 0 failed") +if (BUILD_PYTHON) + set (py_root "${pn_test_root}/python") + set (py_src "${CMAKE_CURRENT_SOURCE_DIR}/bindings/python") + set (py_bin "${CMAKE_CURRENT_BINARY_DIR}/bindings/python") + set (py_bld "${CMAKE_CURRENT_BINARY_DIR}${bld_suffix}") # For windows + set (app_path "${pn_test_bin}/tools/apps/c${bld_suffix}") + set (app_path "${app_path}:${pn_test_root}/tools/apps/python") + set_path (py_path "${py_bin}:${py_bld}:${app_path}:$ENV{PATH}") + set_path (py_pythonpath "${py_root}:${py_src}:${py_bin}:${py_bld}|$ENV{PYTHONPATH}") + if (CMAKE_SYSTEM_NAME STREQUAL Windows) + set_path (py_pythonpath "${py_bin}${bld_suffix}:${py_pythonpath}") + endif (CMAKE_SYSTEM_NAME STREQUAL Windows) + add_test (python-test ${PYTHON_EXECUTABLE} ${env_py} + "PATH=${py_path}" "PYTHONPATH=${py_pythonpath}" ${VALGRIND_ENV} + ${PYTHON_EXECUTABLE} "${py_root}/proton-test") + set_tests_properties(python-test PROPERTIES PASS_REGULAR_EXPRESSION "Totals: .* 0 failed") +endif (BUILD_PYTHON) find_program(RUBY_EXE "ruby") if (RUBY_EXE) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
