aboutsummaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-30 14:11:38 -0400
committerGitHub <noreply@github.com>2017-08-30 14:11:38 -0400
commitbb1c4af48702b934e1a768150f6283ec8c916fb9 (patch)
treea22d6a494f7ab69401ef4b5ec138cdec1b682e36 /travis.sh
parentc3d1d33560462c923f06adb8e9c2f77ffbafa46c (diff)
parent5d431c650f9c4d0aefdcca72d4b950ea8f0214ac (diff)
downloadgoogletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.tar.gz
googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.tar.bz2
googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.zip
Merge branch 'master' into master
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/travis.sh b/travis.sh
index bdecbd96..1b23a3d4 100755
--- a/travis.sh
+++ b/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