Merge pull request #1065 from fingolfin/mh/travis32

travis: enable coverage reporting for 32bit builds

.travis.yml

@@ -26,7 +26,7 @@ matrix:
       after_success:
           - bash <(curl -s https://codecov.io/bash)
     - os: linux
-      env: TEST_SUITE=testbugfix  CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
+      env: TEST_SUITE=testbugfix CFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS="-fprofile-arcs"
       compiler: gcc
       addons:
         apt_packages:
@@ -46,12 +46,13 @@ matrix:
          - texlive-fonts-recommended
          - texlive-fonts-extra
     - os: linux
-      env: TEST_SUITE=testtravis ABI=32
+      env: TEST_SUITE=testtravis ABI=32 CFLAGS="-fprofile-arcs -ftest-coverage -m32" LDFLAGS="-fprofile-arcs"
       compiler: gcc
       addons: 
         apt_packages:
           - libgmp-dev:i386
           - gcc-multilib
+          - g++-multilib
       after_success:
           - bash <(curl -s https://codecov.io/bash)
 

etc/ci.sh

@@ -8,6 +8,11 @@
 
 set -ex
 
+if [[ x"$ABI" == "x32" ]]
+then
+  CONFIGFLAGS="CFLAGS=-m32 LDFLAGS=-m32 LOPTS=-m32 CXXFLAGS=-m32"
+fi
+
 if [[ $TEST_SUITE = 'makemanuals' && $TRAVIS_OS_NAME = 'linux' ]]
 then
     make manuals
@@ -24,16 +29,16 @@ else
         exit 1
     fi
 
-    if [[ x"$ABI" == "x32" ]]
+    if [[ x"$COVERAGE" == "xno" ]]
     then
         sh bin/gap.sh tst/${TEST_SUITE}.g
     else
         cd pkg/io*
-        ./configure
+        ./configure $CONFIGFLAGS
         make
         cd ../..
         cd pkg/profiling*
-        ./configure
+        ./configure $CONFIGFLAGS
         make
         cd ../..