travis: tweak the build matrix

* on OS X, run testinstall instead of testtravis
* remove the separate testbugfix target (it is now part
  of testtravis anyway)
* add a second 32bit build which runs testinstall (as that
  is no longer part of testtravis)

.travis.yml

@@ -7,6 +7,7 @@ env:
 
 matrix:
   include:
+    # 64bit linux builds with GCC
     - os: linux
       env: TEST_SUITE=testinstall
       compiler: gcc
@@ -21,20 +22,16 @@ matrix:
         apt_packages:
           - libgmp-dev
 
+    # OS X builds: since those are slow and limited on Travis,
+    # we only run testinstall for now
     - os: osx
-      env: TEST_SUITE=testtravis
+      env: TEST_SUITE=testinstall
       compiler: clang
       addons:
         apt_packages:
           - libgmp-dev
 
-    - os: linux
-      env: TEST_SUITE=testbugfix
-      compiler: gcc
-      addons:
-        apt_packages:
-          - libgmp-dev
-
+    # test creating the manual
     - os: linux
       env: TEST_SUITE=makemanuals
       compiler: gcc
@@ -47,10 +44,20 @@ matrix:
           - texlive-extra-utils
           - texlive-fonts-recommended
           - texlive-fonts-extra
+
+    # 32bit linux builds with GCC
+    - os: linux
+      env: TEST_SUITE=testinstall ABI=32
+      compiler: gcc
+      addons:
+        apt_packages:
+          - libgmp-dev:i386
+          - gcc-multilib
+
     - os: linux
       env: TEST_SUITE=testtravis ABI=32
       compiler: gcc
-      addons: 
+      addons:
         apt_packages:
           - libgmp-dev:i386
           - gcc-multilib