Merge branch 'master' into user_logger_instead_of_printf

ee53b281 · Gennadiy Civil · GitHub · ca76206f · 69e794ca · ee53b281
Commit ee53b281 authored Sep 01, 2017 by Gennadiy Civil Committed by GitHub Sep 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

travis.sh travis.sh +2 -4

No files found.
--- a/travis.sh
+++ b/travis.sh
@@ -3,13 +3,11 @@ 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