diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-05 18:53:33 (GMT) |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-05-05 18:53:33 (GMT) |
| commit | 10f05a627c2da8d7de78da1b08f984ce8de398fb (patch) | |
| tree | 4f799952ac6fa35647a653cc12caf42efd73e005 /.travis.yml | |
| parent | 5c7c365d5f3e5467de350f2e81a31407a3f52505 (diff) | |
| parent | 278aba369c41e90e9e77a6f51443beb3692919cf (diff) | |
| download | googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.zip googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.gz googletest-10f05a627c2da8d7de78da1b08f984ce8de398fb.tar.bz2 | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8913e89..1200c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,13 +37,15 @@ matrix: group: deprecated-2017Q4 compiler: clang env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 + - os: linux + compiler: clang + env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - os: osx compiler: gcc env: BUILD_TYPE=Debug VERBOSE=1 - os: osx compiler: gcc env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS=-std=c++11 - if: type != pull_request - os: osx compiler: clang env: BUILD_TYPE=Debug VERBOSE=1 |