Use the manylinux docker image for testing also

3 files changed, 14 insertions, 9 deletions

diff --git a/ci/manylinux.sh b/ci/manylinux.sh
index 0cf6a5d..5743989 100755
--- a/ci/manylinux.sh
+++ b/ci/manylinux.sh
@@ -10,6 +10,7 @@
 set -e -x
 
 action=$1
+shift
 
 if [[ $action == "build" ]]; then
     # Compile wheels
@@ -27,19 +28,19 @@ if [[ $action == "build" ]]; then
     done
 
 elif [[ $action == "test" ]]; then
+    # Create "pythonX.Y" links
+    for PYBIN in /opt/python/*/bin/; do
+        PYNAME=$("$PYBIN/python" -c "import sys; print('python{0[0]}.{0[1]}'.format(sys.version_info))")
+        ln -sf "$PYBIN/$PYNAME" /usr/local/bin/$PYNAME
+    done
+
     # Install packages and test
     TOXBIN=/opt/python/cp27-cp27m/bin
     "$TOXBIN/pip" install -r /io/requirements/ci.pip
 
-    for PYBIN in /opt/python/*/bin/; do
-        PYNAME=$("$PYBIN/python" -c "import sys; print('python{0[0]}.{0[1]}'.format(sys.version_info))")
-        TOXENV=$("$PYBIN/python" -c "import sys; print('py{0[0]}{0[1]}'.format(sys.version_info))")
-        ln -s "$PYBIN/$PYNAME" /usr/local/bin/$PYNAME
-        "$TOXBIN/tox" -e $TOXENV
-        rm -f /usr/local/bin/$PYNAME
-        #"${PYBIN}/pip" install python-manylinux-demo --no-index -f /io/dist
-        #(cd "$HOME"; "${PYBIN}/nosetests" pymanylinuxdemo)
-    done
+    cd /io
+    TOXWORKDIR=.tox_linux "$TOXBIN/tox" "$@" || true
+    cd ~
 
 else
     echo "Need an action to perform!"
diff --git a/howto.txt b/howto.txt
index ae85b76..467eb6d 100644
--- a/howto.txt
+++ b/howto.txt
@@ -92,6 +92,9 @@
     - pip install -r requirements/dev.pip
     - $ tox
 
+- Testing on Linux:
+    - $ docker run --rm -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/ci/manylinux.sh test
+
 - For complete coverage testing:
 
     $ make metacov
diff --git a/tox.ini b/tox.ini
index 14cce8d..d3e50a7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@
 [tox]
 envlist = py{26,27,33,34,35,36,37}, pypy{2,3}, jython, doc, lint
 skip_missing_interpreters = {env:COVERAGE_SKIP_MISSING_INTERPRETERS:True}
+toxworkdir = {env:TOXWORKDIR:.tox}
 
 [testenv]
 usedevelop = True