update r774

.travis.yml

@@ -21,11 +21,12 @@ install:
   #- 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 [ "${USE_WINE}" == '1' ]; then sudo apt-get -qq -y install wine; fi
-  - if [ "${CXX}" == 'winegcc' ]; then sudo apt-get -qq install wine-dev; fi
-  - if [ "${CXX}" == 'winegcc' ]; then sudo apt-get -qq install g++-4.5; 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
   # mingw
-  - if [ "${CXX}" == 'i686-w64-mingw32-g++' ]; then sudo apt-get -qq install mingw-w64 g++-mingw-w64; fi
+  - if [ "${MINGW}" == '1' ]; then sudo apt-get -qq install mingw-w64 g++-mingw-w64; fi
   # gcov
   - if [ "${USE_COVERAGE}" = 'gcov' ]; then sudo easy_install cpp-coveralls; fi
   # lcov
@@ -36,6 +37,12 @@ install:
   - if [ "${USE_GTEST}" = '1' ]; then sudo apt-get -qq install libgtest-dev; fi
   - if [ "${USE_GTEST}" = '1' ]; then cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/; cd -; fi
 
+before_script:
+  # mingw
+  - if [ "${MINGW}" == '1' ]; then export CXX=i686-w64-mingw32-g++; fi
+  # winegcc
+  - if [ "${WINEGCC}" == '1' ]; then export CXX=winegcc; fi
+
 script:
   - cd ./test
   - make showcxxversion ${USE_FUSE} all
@@ -72,9 +79,9 @@ matrix:
     - compiler: gcc
       env: USE_GTEST=1
     - compiler: gcc
-      env: CXX=i686-w64-mingw32-g++ USE_WINE=1
+      env: MINGW=1 HOST=WINE
     #- compiler: gcc
-    #  env: CXX=winegcc USE_WINE=1
+    #  env: WINEGCC=1 HOST=WINE
     - compiler: gcc
       env: COVERITY_SCAN=1
       addons:

test/GNUmakefile

@@ -98,7 +98,7 @@ ifdef OUTPUTXML
 CXXFLAGS +=-DOUTPUTXML
 endif
 
-ifdef USE_WINE
+ifeq ($(HOST),WINE)
 WINE_ =wine
 else
 WINE_ =