qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject qpid-dispatch git commit: DISPATCH-1098: Adjust name of unit2 executable for python3 #355
Date Thu, 09 Aug 2018 19:53:37 GMT
Repository: qpid-dispatch
Updated Branches:
  refs/heads/master ba8737373 -> 18c73aeed


DISPATCH-1098: Adjust name of unit2 executable for python3 #355

This closes #355


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/18c73aee
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/18c73aee
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/18c73aee

Branch: refs/heads/master
Commit: 18c73aeed0e0ae906eea3a903121c03bec815088
Parents: ba87373
Author: Chuck Rolke <crolke@redhat.com>
Authored: Thu Aug 9 15:52:35 2018 -0400
Committer: Chuck Rolke <crolke@redhat.com>
Committed: Thu Aug 9 15:52:35 2018 -0400

----------------------------------------------------------------------
 CMakeLists.txt       | 2 ++
 tests/CMakeLists.txt | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/18c73aee/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17dcb79..9dc7180 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,10 @@ include(FindPythonLibs)
 
 if (PYTHON_VERSION_MAJOR STREQUAL 3)
     set(PY_STRING "python3")
+    set(PY_UNIT2_STRING "unit2-3")
 elseif(PYTHON_VERSION_MAJOR STREQUAL 2)
     set(PY_STRING "python")
+    set(PY_UNIT2_STRING "unit2")
 endif()
 
 # Find python-unittest2

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/18c73aee/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ed6651c..313ee9d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -66,9 +66,9 @@ add_test(unit_tests_size_1     ${TEST_WRAP} -x unit_tests_size 1)
 add_test(unit_tests            ${TEST_WRAP} -x unit_tests ${CMAKE_CURRENT_SOURCE_DIR}/threads4.conf)
 
 # Unit test python modules
-add_test(router_engine_test    ${TEST_WRAP} -x unit2 -v router_engine_test)
-add_test(management_test       ${TEST_WRAP} -x unit2 -v management)
-add_test(router_policy_test    ${TEST_WRAP} -x unit2 -v router_policy_test)
+add_test(router_engine_test    ${TEST_WRAP} -x ${PY_UNIT2_STRING} -v router_engine_test)
+add_test(management_test       ${TEST_WRAP} -x ${PY_UNIT2_STRING} -v management)
+add_test(router_policy_test    ${TEST_WRAP} -x ${PY_UNIT2_STRING} -v router_policy_test)
 
 if(USE_LIBWEBSOCKETS)
   set(SYSTEM_TESTS_HTTP system_tests_http)
@@ -120,7 +120,7 @@ foreach(py_test_module
     ${CONSOLE_TEST}
     )
 
-  add_test(${py_test_module} ${TEST_WRAP} -x unit2 -v ${py_test_module})
+  add_test(${py_test_module} ${TEST_WRAP} -x ${PY_UNIT2_STRING} -v ${py_test_module})
   list(APPEND SYSTEM_TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${py_test_module}.py)
 endforeach()
 


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


Mime
View raw message