fixes from comments: MB_TEST_VER -> DOCKER_TEST_IMAGE; run tests

.travis.yml

@@ -26,7 +26,7 @@ matrix:
       env:
         - TEST_BUILDS=1
         - MB_ML_VER=2010
-        - MB_TEST_VER=multibuild/xenial
+        - DOCKER_TEST_IMAGE=multibuild/xenial64
     # 32-bit builds
     - os: linux
       dist: xenial
@@ -39,7 +39,7 @@ matrix:
         - TEST_BUILDS=1
         - PLAT=i686
         - MB_ML_VER=2010
-        - MB_TEST_VER=multibuild/bionic
+        - DOCKER_TEST_IMAGE=multibuild/bionic32
     # Builds with caching
     - os: linux
       dist: xenial

README.rst

@@ -125,14 +125,12 @@ real ``build_wheel`` function, which now comes (by default) from
 Test phase
 ----------
 
-Specify the version to test with the ``MB_TEST_VER`` environment variable. The
-default version is ``matthewbrett/trusty:``. A suffix will be added by the
-``PLAT`` choice: ``i686`` will add ``32``, all others will add ``64``.
-Versions that are currently valid are:
-
-* ``matthewbrett/trusty:`` (32 or 64)
-* ``multibuild/bionic`` (32 only)
-* ``multibuild/xenial`` (64 only)
+Specify the version to test with the ``DOCKER_TEST_IMAGE`` environment variable. The
+default version is ``matthewbrett/trusty:64``, or for ``i686`` platforms
+``matthewbrett/trusty:32``. Other versions that are currently valid are:
+
+* ``multibuild/bionic32`` (32 only)
+* ``multibuild/xenial64`` (64 only)
 
 See ``multibuild/docker_test_wrap.sh``.
 

tests/config.sh

+function run_tests {
+    python -c "import simplejson"
+}
+

tests/test_multibuild.sh

@@ -43,6 +43,9 @@ if [ -n "$TEST_BUILDS" ]; then
         "
         build_multilinux $my_plat "pip install simplejson"
     fi
+    build_index_wheel simplejson
+    CONFIG_PATH=tests/config.sh
+    install_run $PLAT
 fi
 
 source tests/test_supported_wheels.sh

travis_linux_steps.sh

@@ -121,9 +121,13 @@ function install_run {
     #  TEST_DEPENDS  (optional)
     #  MB_TEST_VER (optional)
     local plat=${1:-${PLAT:-x86_64}}
-    local mb_test_ver=${MB_TEST_VER:-"matthewbrett/trusty:"}
-    bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
-    local docker_image=$mb_test_ver$bitness
+    local mb_test_ver=${DOCKER_TEST_IMAGE:-"matthewbrett/trusty:"}
+    if [ -z "$DOCKER_TEST_IMAGE" ]; then
+        local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
+        local docker_image="matthewbrett/trusty:$bitness"
+    else
+        local docker_image=$DOCKER_TEST_IMAGE
+    fi
     docker pull $docker_image
     docker run --rm \
         -e PYTHON_VERSION="$MB_PYTHON_VERSION" \