aboutsummaryrefslogtreecommitdiffstats
path: root/travis.sh
diff options
context:
space:
mode:
authorTanzinul Islam <t_17_7@hotmail.com>2017-09-06 01:05:24 +0100
committerTanzinul Islam <t_17_7@hotmail.com>2017-09-06 01:05:24 +0100
commit78b1ff074799c776f90a77203fcd7adc98e11736 (patch)
tree21974f2d4f0d4aeaff5a4027df84889a2619ae25 /travis.sh
parenta838de3348add7530431e8d91c8a66cc646f1888 (diff)
parent857ddeadebe4aa75efcee728651d0947a5a1065a (diff)
downloadgoogletest-78b1ff074799c776f90a77203fcd7adc98e11736.tar.gz
googletest-78b1ff074799c776f90a77203fcd7adc98e11736.tar.bz2
googletest-78b1ff074799c776f90a77203fcd7adc98e11736.zip
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/travis.sh b/travis.sh
index bdecbd96..bd226a8d 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
+ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+ ..
make
CTEST_OUTPUT_ON_FAILURE=1 make test