qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [34/50] qpid-proton git commit: NO-JIRA: Add missing CLASSPATH needed to run python tests in proton-c/CMakeLists.txt
Date Thu, 09 Jul 2015 22:12:14 GMT
NO-JIRA: Add missing CLASSPATH needed to run python tests in proton-c/CMakeLists.txt


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/89fca58f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/89fca58f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/89fca58f

Branch: refs/heads/cjansen-cpp-client
Commit: 89fca58f484ffbcb3e8baa8ef9d82964672d111f
Parents: d98868c
Author: Alan Conway <aconway@redhat.com>
Authored: Mon Jul 6 13:20:07 2015 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon Jul 6 13:20:07 2015 -0400

----------------------------------------------------------------------
 proton-c/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/89fca58f/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index a3a98c2..72f8d6a 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -494,8 +494,10 @@ if (BUILD_PYTHON)
   to_native_path ("${py_pythonpath}" py_pythonpath)
   add_test (NAME python-test
             COMMAND ${env_py}
-	             "PATH=${py_path}" "PYTHONPATH=${py_pythonpath}" "PKG_CONFIG_PATH=${pn_c_root}"
${VALGRIND_ENV}
-                    ${PYTHON_EXECUTABLE} "${py_root}/proton-test")
+	    "PATH=${py_path}" "PYTHONPATH=${py_pythonpath}" "PKG_CONFIG_PATH=${pn_c_root}"
+            "CLASSPATH=${CMAKE_BINARY_DIR}/proton-j/proton-j.jar"
+            ${VALGRIND_ENV}
+            ${PYTHON_EXECUTABLE} "${py_root}/proton-test")
   set_tests_properties(python-test PROPERTIES PASS_REGULAR_EXPRESSION "Totals: .* 0 failed")
   else (NOT OLD_ADD_TEST_COMMAND)
   list (APPEND py_path "${Proton_BINARY_DIR}/tests/tools/apps/c")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message