diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-29 22:07:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 22:07:39 -0400 |
| commit | 1db4a426d4f7809a4a54d0b804cd956e6d00e090 (patch) | |
| tree | 7ab3ec2ca5369db0084ff71e572cb1707f1d76a2 | |
| parent | f1e529a808ffa52166dd2014372f56c440ed16c4 (diff) | |
| parent | 3dbba3b072b1e67c5dc6793741da4b5408f8a552 (diff) | |
| download | googletest-1db4a426d4f7809a4a54d0b804cd956e6d00e090.tar.gz googletest-1db4a426d4f7809a4a54d0b804cd956e6d00e090.tar.bz2 googletest-1db4a426d4f7809a4a54d0b804cd956e6d00e090.zip | |
Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4
| -rwxr-xr-x | ci/env-linux.sh | 2 | ||||
| -rwxr-xr-x | ci/env-osx.sh | 2 | ||||
| -rw-r--r-- | googletest/docs/primer.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/env-linux.sh b/ci/env-linux.sh index 9086b1f9..37800d6a 100755 --- a/ci/env-linux.sh +++ b/ci/env-linux.sh @@ -37,5 +37,5 @@ if [ "${TRAVIS_OS_NAME}" = "linux" ]; then if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi + if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi fi diff --git a/ci/env-osx.sh b/ci/env-osx.sh index 31c88357..127a969b 100755 --- a/ci/env-osx.sh +++ b/ci/env-osx.sh @@ -36,5 +36,5 @@ # TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}. if [ "${TRAVIS_OS_NAME}" = "linux" ]; then - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi + if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi fi diff --git a/googletest/docs/primer.md b/googletest/docs/primer.md index 02dea424..7a8ea8d7 100644 --- a/googletest/docs/primer.md +++ b/googletest/docs/primer.md @@ -317,7 +317,7 @@ To create a fixture: 1. If necessary, write a destructor or `TearDown()` function to release any resources you allocated in `SetUp()` . To learn when you should use the constructor/destructor and when you should use `SetUp()/TearDown()`, read - this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function) entry. + this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-setupteardown) entry. 1. If needed, define subroutines for your tests to share. When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to |