aboutsummaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorChe-Hsun Liu <chehsunliu@gmail.com>2017-08-31 19:02:12 +0800
committerGitHub <noreply@github.com>2017-08-31 19:02:12 +0800
commit3eaba9f07c5f81a8b83432e4ae389ee42337393f (patch)
tree948d6ccdcf5a59ec1310cf81817ea2042236bbb9 /travis.sh
parent24696c3958f0be6a87b52f07436417c53d0fef24 (diff)
parent16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff)
downloadgoogletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.gz
googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.bz2
googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.zip
Merge branch 'master' into master
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