aboutsummaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-09-01 00:05:22 -0400
committerGitHub <noreply@github.com>2017-09-01 00:05:22 -0400
commitee53b281ba16f5402e3a42003414a68d336fcd94 (patch)
tree2e629c5674eb80d2090aca0c27f8388d5b4801da /travis.sh
parentca76206f4268a009427afa96dfd792012db64583 (diff)
parent69e794ca75e6c07ad78a8f7467c267be9ac08921 (diff)
downloadgoogletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.gz
googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.tar.bz2
googletest-ee53b281ba16f5402e3a42003414a68d336fcd94.zip
Merge branch 'master' into user_logger_instead_of_printf
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/travis.sh b/travis.sh
index bdecbd96..6e7f06ab 100755
--- 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