aboutsummaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-29 19:30:18 -0400
committerGitHub <noreply@github.com>2017-08-29 19:30:18 -0400
commit58fd184c7f7a16401bb78eaec9e00b6e0a9581e9 (patch)
tree38e5fd46df897b7702e74ac8bd568f5248c2d7ff /travis.sh
parent30c1e00afbc083618abd745362c41d41a5ac61d0 (diff)
parentc4126e0463a82e710cc1a9928eca77c396614ca1 (diff)
downloadgoogletest-58fd184c7f7a16401bb78eaec9e00b6e0a9581e9.tar.gz
googletest-58fd184c7f7a16401bb78eaec9e00b6e0a9581e9.tar.bz2
googletest-58fd184c7f7a16401bb78eaec9e00b6e0a9581e9.zip
Merge branch 'master' into hethi/typo-xUnit
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