commit d33861dca6fac5482f0c82a413a2571172d16fac
author Herbert Thielen <thielen@hs-worms.de> Tue Aug 29 17:41:26 2017 +0200
committer Herbert Thielen <thielen@hs-worms.de> Tue Aug 29 17:41:26 2017 +0200
tree 1bff928f51ed3455d9a100d25078e3db51aaab54
parent 4a451575895dc665db33cd940b47f38e804a291d

run combined build only

There is no need for separate 'googlemock' and 'googletest' builds,
as the 'googlemock' build includes 'googletest' and it's unit tests.

travis.sh

diff --git a/travis.sh b/travis.sh
index bdecbd9..1b23a3d 100755
--- a/travis.sh
+++ b/travis.sh
@@ -3,13 +3,12 @@
 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