Merge branch 'master' into hethi/typo-xUnit

.travis.yml

@@ -36,11 +36,8 @@ compiler:
 script: ./travis.sh
 env:
   matrix:
-    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
-    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug   VERBOSE_MAKE=true VERBOSE
-    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug CXX_FLAGS=-std=c++11  VERBOSE_MAKE=true VERBOSE
-#    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
-#    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
+    - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
+    - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11
 notifications:
   email: false
 sudo: false

travis.sh

@@ -3,13 +3,12 @@ set -evx
 env | sort
 
 mkdir build || true
-mkdir build/$GTEST_TARGET || true
-cd build/$GTEST_TARGET
+cd build
 cmake -Dgtest_build_samples=ON \
       -Dgmock_build_samples=ON \
       -Dgtest_build_tests=ON \
       -Dgmock_build_tests=ON \
       -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
-      ../../$GTEST_TARGET
+      ..
 make
 CTEST_OUTPUT_ON_FAILURE=1 make test