diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-25 22:09:27 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 22:09:27 -0700 |
commit | 907ae9edad16f31d6b5f8aaf7c4a73839f41502b (patch) | |
tree | e6afd498b45d58788ce23122165e2b79fcb0469f /.travis.yml | |
parent | a4f57cf49a4533cbc6e21c5eb6d964eda6898bda (diff) | |
parent | 75e834700d19aa373b428c7c746f951737354c28 (diff) | |
download | googletest-907ae9edad16f31d6b5f8aaf7c4a73839f41502b.tar.gz googletest-907ae9edad16f31d6b5f8aaf7c4a73839f41502b.tar.bz2 googletest-907ae9edad16f31d6b5f8aaf7c4a73839f41502b.zip |
Merge branch 'master' into python3-tests
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index d1fe6eb5..2b0ac21a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,14 +18,14 @@ matrix: - os: linux compiler: clang sudo : true - env: TEST_CLANG_FORMAT="yes" install: ./ci/install-linux.sh && ./ci/log-config.sh - script: ./ci/test_format.sh && ./ci/build-linux-bazel.sh + script: ./ci/build-linux-bazel.sh - os: linux group: deprecated-2017Q4 compiler: gcc install: ./ci/install-linux.sh && ./ci/log-config.sh script: ./ci/build-linux-autotools.sh + env: VERBOSE=1 CXXFLAGS=-std=c++11 - os: linux group: deprecated-2017Q4 compiler: gcc @@ -66,7 +66,6 @@ addons: packages: - g++-4.9 - clang-3.9 - - clang-format-3.9 notifications: email: false |