You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by dn...@apache.org on 2015/07/09 15:24:58 UTC
qpid-proton git commit: NO-JIRA: update jenkins & travis to run tox
Repository: qpid-proton
Updated Branches:
refs/heads/master a02ad90ca -> ed3136723
NO-JIRA: update jenkins & travis to run tox
Add the new 'python-tox-test' ctest (that can be run to test the python
bindings against multiple interpreters, e.g., py2.7, py3.3 etc.) to
the CI jobs
Closes #44
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ed313672
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ed313672
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ed313672
Branch: refs/heads/master
Commit: ed313672338e5e813cd9d9ba3b7f2dc3a9fab1fb
Parents: a02ad90
Author: Dominic Evans <do...@uk.ibm.com>
Authored: Thu Jul 9 14:24:28 2015 +0100
Committer: Dominic Evans <do...@uk.ibm.com>
Committed: Thu Jul 9 14:24:28 2015 +0100
----------------------------------------------------------------------
.travis.yml | 15 ++++++++++++---
bin/jenkins-proton-c-build.sh | 17 +++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed313672/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 6d1a73e..baeb5d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,20 @@
---
-language: c
+language: python
install:
- sudo apt-get update -qq
- sudo apt-get install -y -qq bash cmake libssl-dev maven ruby ruby-dev
- python python-dev php5 openjdk-7-jdk swig uuid-dev valgrind libsasl2-dev
- sasl2-bin
+ python python-dev python3 python3-dev php5 openjdk-7-jdk swig uuid-dev
+ valgrind libsasl2-dev sasl2-bin
+- pip install tox
- gem install rspec simplecov
+before_script:
+- export PATH=${HOME}/.local/bin:${PATH}
+- export PYTHON_PATHS=$(ls -d /opt/python/*)
+- echo PYTHON_PATHS=${PYTHON_PATHS}
+- for PYTHON_DIR in ${PYTHON_PATHS} ;
+ do export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${PYTHON_DIR} ;
+ done
+- echo CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
script:
- bin/jenkins-proton-c-build.sh
os:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed313672/bin/jenkins-proton-c-build.sh
----------------------------------------------------------------------
diff --git a/bin/jenkins-proton-c-build.sh b/bin/jenkins-proton-c-build.sh
index 8f0545f..51db562 100755
--- a/bin/jenkins-proton-c-build.sh
+++ b/bin/jenkins-proton-c-build.sh
@@ -20,6 +20,21 @@ echo =========================
which python || exit 1
which swig || exit 1
+# if python-pip is available, install the python tox test tool
+RUN_TOX=false
+PIP=$(type -p pip || true)
+if [ -n $PIP ] && [ -x "$PIP" ]; then
+ ldir=$(python -c 'import site; print("%s" % site.USER_BASE)')
+ PATH="$ldir/bin:$PATH"
+ echo "PATH=$PATH"
+ if [ $VIRTUAL_ENV ]; then
+ pip install -U tox
+ else
+ pip install --user -U tox
+ fi
+ RUN_TOX=true
+fi
+
ls
rm -rf build testresults >/dev/null 2>&1
@@ -32,6 +47,8 @@ cmake --build . --target install
echo Running tests
+$RUN_TOX && ctest -V -R 'python-tox-test'
+
source config.sh
# proton-c tests via python
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org