qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject qpid-proton git commit: NO-JIRA: move tox output files to build directory.
Date Mon, 04 Jan 2016 15:01:27 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 8a35409a9 -> 253bdafe6


NO-JIRA: move tox output files to build directory.

Moved .tox output directory to build tree.
.gitignore build files in the python tree (build/ and MANIFEST)


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

Branch: refs/heads/master
Commit: 253bdafe63a326f38ec22022ecc52ad8c449bfbf
Parents: 8a35409
Author: Alan Conway <aconway@redhat.com>
Authored: Wed Dec 30 18:08:33 2015 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon Jan 4 09:50:16 2016 -0500

----------------------------------------------------------------------
 .gitignore                       |  5 +++++
 proton-c/CMakeLists.txt          |  4 +++-
 proton-c/bindings/python/tox.ini | 28 ----------------------------
 proton-c/tox.ini.in              | 29 +++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/253bdafe/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index ad4eebb..aa9bc36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,8 @@ testresults
 # Go binding build output
 /proton-c/bindings/go/pkg
 /proton-c/bindings/go/bin
+
+# Python TOX test build output
+/proton-c/bindings/python/MANIFEST
+/proton-c/bindings/python/build
+

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/253bdafe/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index b645563..85d819c 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -552,9 +552,11 @@ if (BUILD_PYTHON)
   if (CMAKE_SYSTEM_NAME STREQUAL Linux AND TOX_TEST)
      find_program(TOX_EXE "tox")
      if (TOX_EXE)
+       configure_file(
+         "${CMAKE_CURRENT_SOURCE_DIR}/tox.ini.in"
+         "${CMAKE_CURRENT_BINARY_DIR}/tox.ini")
          to_native_path ("${py_path}" py_path)
          add_test (NAME python-tox-test
-		   WORKING_DIRECTORY ${py_src}
                    COMMAND ${env_py}
 		   "PATH=${py_path}" "QPID_PROTON_SRC=${CMAKE_CURRENT_SOURCE_DIR}/../"
                    "CLASSPATH=${CMAKE_BINARY_DIR}/proton-j/proton-j.jar"

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/253bdafe/proton-c/bindings/python/tox.ini
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/tox.ini b/proton-c/bindings/python/tox.ini
deleted file mode 100644
index 4501460..0000000
--- a/proton-c/bindings/python/tox.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[tox]
-envlist = py26,py27,py33,py34
-minversion = 1.4
-skipdist = True
-
-[testenv]
-usedevelop = False
-setenv =
-    VIRTUAL_ENV={envdir}
-    PKG_CONFIG_PATH=None
-    QPID_PROTON_SRC={toxinidir}/../../../
-    DEBUG=True
-passenv =
-    PKG_CONFIG_PATH
-    CFLAGS
-    SASLPASSWD
-    VALGRIND
-    CLASSPATH
-commands =
-    {toxinidir}/../../../tests/python/proton-test {posargs}
-deps =
-    unittest2
-
-[testenv:pep8]
-commands = flake8
-
-[testenv:docs]
-commands = python setup.py build_sphinx

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/253bdafe/proton-c/tox.ini.in
----------------------------------------------------------------------
diff --git a/proton-c/tox.ini.in b/proton-c/tox.ini.in
new file mode 100644
index 0000000..9347227
--- /dev/null
+++ b/proton-c/tox.ini.in
@@ -0,0 +1,29 @@
+[tox]
+envlist = py26,py27,py33,py34
+minversion = 1.4
+skipdist = True
+setupdir = @py_src@
+
+[testenv]
+usedevelop = False
+setenv =
+    VIRTUAL_ENV={envdir}
+    PKG_CONFIG_PATH=None
+    DEBUG=True
+    QPID_PROTON_SRC=@CMAKE_SOURCE_DIR@
+passenv =
+    PKG_CONFIG_PATH
+    CFLAGS
+    SASLPASSWD
+    VALGRIND
+    CLASSPATH
+commands =
+    @CMAKE_SOURCE_DIR@/tests/python/proton-test {posargs}
+deps =
+    unittest2
+
+[testenv:pep8]
+commands = flake8
+
+[testenv:docs]
+commands = python setup.py build_sphinx


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


Mime
View raw message