qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [2/3] qpid-proton git commit: NO-JIRA: Cmake setting to disable TOX test, enabled by default.
Date Tue, 14 Jul 2015 22:26:58 GMT
NO-JIRA: Cmake setting to disable TOX test, enabled by default.


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

Branch: refs/heads/cjansen-cpp-client
Commit: 976950df6798f015b275150121e3a10da5666cdb
Parents: 1e45188
Author: Alan Conway <aconway@redhat.com>
Authored: Fri Jul 10 10:11:08 2015 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon Jul 13 16:44:39 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/976950df/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 71c06e4..06189d4 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -512,7 +512,8 @@ if (BUILD_PYTHON)
   # platforms will be supported. Since `setup.py` will skip
   # the build for non linux plaforms, it doesn't make sense
   # to try to run them.
-  if (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  option(TOX_TEST "Enable muti-version python testing with TOX" ON)
+  if (CMAKE_SYSTEM_NAME STREQUAL Linux AND TOX_TEST)
      find_program(TOX_CMD "tox")
      if (TOX_CMD)
          list (APPEND py_path "${Proton_BINARY_DIR}/tests/tools/apps/c")
@@ -532,7 +533,7 @@ if (BUILD_PYTHON)
      else (TOX_CMD)
          message(STATUS "The tox tool is not available - skipping the python-tox-tests")
      endif (TOX_CMD)
-  endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
+  endif (CMAKE_SYSTEM_NAME STREQUAL Linux AND TOX_TEST)
 
 endif (BUILD_PYTHON)
 


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


Mime
View raw message