Merge remote-tracking branch 'origin/master' into travis

Author: Arnd R. Strube

.travis.yml

@@ -8,34 +8,48 @@ compiler:
 rvm:
 - 1.9.3
 env:
-  - BUILDTOOL=autotools
-  - BUILDTOOL=autotools_old_compilers
-  - BUILDTOOL=cmake
-  - BUILDTOOL=cmake-coverage
-  - BUILDTOOL=make-dos
+  - BUILD=autotools
+  - BUILD=cmake
+  - BUILD=autotools_gtest
+  - BUILD=cmake_gtest
+  - BUILD=test_report
+  - BUILD=autotools_old_compilers
+  - BUILD=cmake-coverage
+  - BUILD=make-dos
 matrix:
     exclude:
-    - env: BUILDTOOL=cmake-coverage
-    - env: BUILDTOOL=autotools_old_compilers
-    - env: BUILDTOOL=make-dos
+    - env: BUILD=cmake-coverage
+    - env: BUILD=autotools_old_compilers
+    - env: BUILD=make-dos
+    - env: BUILD=test_report
     - compiler: wcl
     include:
-    - env: BUILDTOOL=cmake-coverage
+    - env: BUILD=cmake-coverage
       compiler: gcc
-    - env: BUILDTOOL=make-dos
+    - env: BUILD=test_report
+      compiler: gcc
+    - env: BUILD=make-dos
       compiler: wcl
 global:
 - secure: |-
       P05xUfJVw5YM4hF7hzQLjyMzDD4Q1/fyWP9Uk5aK5VrSWNY99EuxldXI5QK/
       vA1NkcW49tQW1wQvBlRtdlLNOmUfDP/oiJFXPwNn4dqwOIOEet2P7JO/5hnH
       MNHlZmGu2WpoZREhOFBfsIhK0IP8mloqLDq2XemBdga/LWygrLU=
 - secure: Y/8iNkf6uEbE3qltnM+7mGlCvFWzyttwwRGgVGw1m9xOiUJcobvOImQRU8XZ91dgO+Fz0A3mljqs1sK1OPjpXmFGE1jP/NlotMw0WlDOuSIDjQ4ubwdTNGAwNY53R9ygbIjEmqxHAJm9mOZqxW2hNaoI7TcX6oX248/hLibyx8M=
+addons:
+  apt:
+    packages:
+      # - dosbox
+      - valgrind
+before_install:
+  #  - sudo pip install cpp-coveralls
+  - sudo apt-get install dosbox
 install:
-- gem install travis_github_deployer
-- sudo apt-get update --fix-missing
-- sudo apt-get install valgrind
+  - gem install travis_github_deployer
+  - sudo apt-get update --fix-missing
+    #  - sudo apt-get install valgrind
 before_script:
-- export CPPUTEST_BUILD_DIR=$TRAVIS_BUILD_DIR/cpputest_build
-- mkdir -p $CPPUTEST_BUILD_DIR && cd $CPPUTEST_BUILD_DIR
+  - export CPPUTEST_BUILD_DIR=$TRAVIS_BUILD_DIR/cpputest_build
+  - mkdir -p $CPPUTEST_BUILD_DIR && cd $CPPUTEST_BUILD_DIR
 script:
 - "../scripts/travis_ci_build.sh"

scripts/travis_ci_build.sh

@@ -1,24 +1,13 @@
 #!/bin/bash
 # Script run in the travis CI
-set -e
+set -ex
 
-if [ "x$BUILDTOOL" = "xautotools" ]; then
+if [ "x$BUILD" = "xautotools" ]; then
     autoreconf -i ..
     ../configure
     echo "CONFIGURATION DONE. Compiling now."
     make check_all
 
-    # Special check for all the gtest versions.
-    make check_gtest
-
-    # One more normal build for generating test reports
-    ../configure
-    make check
-    ./CppUTestTests -ojunit
-    ./CppUTestExtTests -ojunit
-    cp ../scripts/generate_junit_report_ant.xml .
-    ant -f generate_junit_report_ant.xml
-
     make dist
     make dist-zip
 
@@ -28,17 +17,26 @@ if [ "x$BUILDTOOL" = "xautotools" ]; then
     fi;
 fi
 
-if [ "x$BUILDTOOL" = "xcmake" ]; then
+if [ "x$BUILD" = "xcmake" ]; then
     cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
-    make || exit 1
-    ctest -V || exit 1
+    make
+    ctest -V
 
     if [ "x$CXX" != "xg++" ]; then
         cmake .. -DC++11=ON -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
-        make || exit 1
-        ctest -V || exit 1
+        make
+        ctest -V
     fi
+fi
 
+if [ "x$BUILD" = "xautotools_gtest" ]; then
+    autoreconf -i ..
+    ../configure
+
+    make check_gtest
+fi
+
+if [ "x$BUILD" = "xcmake_gtest" ]; then
     wget https://googlemock.googlecode.com/files/gmock-1.6.0.zip
     unzip gmock-1.6.0.zip -d $TRAVIS_BUILD_DIR
     cd $TRAVIS_BUILD_DIR/gmock-1.6.0
@@ -47,33 +45,44 @@ if [ "x$BUILDTOOL" = "xcmake" ]; then
 
     export GMOCK_HOME=$TRAVIS_BUILD_DIR/gmock-1.6.0
     export GTEST_HOME=$TRAVIS_BUILD_DIR/gmock-1.6.0/gtest
-    cmake .. -DGMOCK=ON || exit 1
-    make || exit 1
-    ctest -V || exit 1
+    cmake .. -DGMOCK=ON
+    make
+    ctest -V
 fi
 
-if [ "x$BUILDTOOL" = "xcmake-coverage" ]; then
-    sudo pip install cpp-coveralls
+if [ "x$BUILD" = "xtest_report" ]; then
+    autoreconf -i ..
+    ../configure
+    make check
+    ./CppUTestTests -ojunit
+    ./CppUTestExtTests -ojunit
+    cp ../scripts/generate_junit_report_ant.xml .
+    ant -f generate_junit_report_ant.xml
+fi
+
+if [ "x$BUILD" = "xcmake-coverage" ]; then
+  pip install cpp-coveralls --user `whoami`
+
     cmake .. -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCOVERAGE=ON
-    make || exit 1
-    ctest || exit 1
+    make
+    ctest
 
     coveralls -b . -r .. -i "src" -i "include" --gcov-options="-bc" || true
 fi
 
-if [ "x$BUILDTOOL" = "xmake-dos" ]; then
-    sudo apt-get install dosbox
+if [ "x$BUILD" = "xmake-dos" ]; then
     wget ftp://ftp.openwatcom.org/pub/open-watcom-c-linux-1.9 -O /tmp/watcom.zip
     mkdir -p watcom && unzip -aqd watcom /tmp/watcom.zip && sudo chmod -R 755 watcom/binl
     export PATH=$PATH:$PWD/watcom/binl
     export WATCOM=$PWD/watcom
     export CPPUTEST_HOME=$TRAVIS_BUILD_DIR
+    wcl --version
     export CC=wcl
     export CXX=wcl
     $CC --version
     make -f ../platforms/Dos/Makefile || exit 1
-	printf "" > exit  # has to be there so dosbox will do 'exit' correctly
-	printf "\n" > ./ALLTESTS.LOG
+    printf "" > exit  # has to be there so dosbox will do 'exit' correctly
+    printf "\n" > ./ALLTESTS.LOG
     dosbox -conf ../platforms/Dos/dosbox-0.74.conf exit \
       -c "echo.>>ALLTESTS.LOG" \
       -c "echo.>>ALLTESTS.LOG" \
@@ -85,4 +94,3 @@ if [ "x$BUILDTOOL" = "xmake-dos" ]; then
     cat ALLTESTS.LOG
     # Generate an error here if failures occur in ALLTESTS.LOG
 fi
-