update r814

.travis.yml

@@ -5,31 +5,32 @@ compiler:
   - gcc
 
 before_install:
-  - if [ "${CXX}" = 'g++' ] && [ "${HOST}" != 'WINE' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+  - if [ "${CXX}" = 'g++' ] && [ "${HOST}" != 'WINE' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then sudo export USE_GCC48=yes; fi
+  - if [ "${USE_GCC48}" = 'yes' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
   #- if [ "${CXX}" = 'clang++' ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi
   #- if [ "${CXX}" = 'clang++' ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi
   #- if [ "${CXX}" = 'clang++' ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
-  - if [ "${HOST}" == 'WINE' ]; then sudo add-apt-repository -y ppa:ubuntu-wine/ppa; fi
+  - if [ "${HOST}" = 'WINE' ]; then sudo add-apt-repository -y ppa:ubuntu-wine/ppa; fi
   - sudo apt-get -qq update
 
 install:
   # gcc 4.8
-  - if [ "${CXX}" = 'g++' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then sudo apt-get -qq install g++-4.8; fi
-  - if [ "${CXX}" = 'g++' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then sudo update-alternatives --install /usr/bin/gcc  gcc  /usr/bin/gcc-4.8 90; fi
-  - if [ "${CXX}" = 'g++' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then sudo update-alternatives --install /usr/bin/g++  g++  /usr/bin/g++-4.8 90; fi
-  - if [ "${CXX}" = 'g++' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90;  fi
+  - if [ "${USE_GCC48}" = 'yes' ]; then sudo apt-get -qq install g++-4.8; fi
+  - if [ "${USE_GCC48}" = 'yes' ]; then sudo update-alternatives --install /usr/bin/gcc  gcc  /usr/bin/gcc-4.8 90; fi
+  - if [ "${USE_GCC48}" = 'yes' ]; then sudo update-alternatives --install /usr/bin/g++  g++  /usr/bin/g++-4.8 90; fi
+  - if [ "${USE_GCC48}" = 'yes' ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90;  fi
   # clang 3.5
   #- if [ "${CXX}" = 'clang++' ]; then sudo apt-get -qq install clang-3.5; fi
   #- if [ "${CXX}" = 'clang++' ]; then export CXX="clang++-3.5";  fi
   # wine
-  - if [ "${HOST}" == 'WINE' ]; then sudo apt-get -qq -y install wine; fi
+  - if [ "${HOST}" = 'WINE' ]; then sudo apt-get -qq -y install wine; fi
   # winegcc
-  - if [ "${WINEGCC}" == '1' ]; then sudo apt-get -qq install wine-dev; fi
-  - if [ "${WINEGCC}" == '1' ]; then sudo apt-get -qq install g++-4.5; fi
+  - if [ "${WINEGCC}" = '1' ]; then sudo apt-get -qq install wine-dev; fi
+  - if [ "${WINEGCC}" = '1' ]; then sudo apt-get -qq install g++-4.5; fi
   # mingw
-  - if [ "${MINGW}" == '1' ]; then sudo apt-get -qq install binutils-mingw-w64-i686; fi
-  - if [ "${MINGW}" == '1' ]; then sudo apt-get -qq install gcc-mingw-w64-i686; fi
-  - if [ "${MINGW}" == '1' ]; then sudo apt-get -qq install g++-mingw-w64-i686; fi
+  - if [ "${MINGW}" = '1' ]; then sudo apt-get -qq install binutils-mingw-w64-i686; fi
+  - if [ "${MINGW}" = '1' ]; then sudo apt-get -qq install gcc-mingw-w64-i686; fi
+  - if [ "${MINGW}" = '1' ]; then sudo apt-get -qq install g++-mingw-w64-i686; fi
   # gcov
   - if [ "${USE_COVERAGE}" = 'gcov' ]; then sudo easy_install cpp-coveralls; fi
   # lcov
@@ -42,9 +43,9 @@ install:
 
 before_script:
   # mingw
-  - if [ "${MINGW}" == '1' ]; then export CXX=i686-w64-mingw32-g++; fi
+  - if [ "${MINGW}" = '1' ]; then export CXX=i686-w64-mingw32-g++; fi
   # winegcc
-  - if [ "${WINEGCC}" == '1' ]; then export CXX=wineg++; fi
+  - if [ "${WINEGCC}" = '1' ]; then export CXX=wineg++; fi
 
 script:
   - cd ./test