diff options
author | Abseil Team <absl-team@google.com> | 2020-12-02 13:30:39 -0500 |
---|---|---|
committer | vslashg <gfalcon@google.com> | 2020-12-02 13:32:15 -0500 |
commit | 43ff1a6787011ec729ba32f3e12e796a3ef988dc (patch) | |
tree | bfcc2ae81ba05b26b8cbc4f4dee3b74329105087 | |
parent | b1fbd33c06cdb0024c67733c6fdec2009d17b384 (diff) | |
download | googletest-git-43ff1a6787011ec729ba32f3e12e796a3ef988dc.tar.gz |
Googletest exportFE2774773A77F1D7EA51AFAD32EA53C9
- 345261790 BEGIN_PUBLIC by Abseil Team <absl-team@google.com>
- 345106443 BEGIN_PUBLIC by Abseil Team <absl-team@google.com>
- 344882646 BEGIN_PUBLIC by dmauro <dmauro@google.com>
- 344054658 BEGIN_PUBLIC by Abseil Team <absl-team@google.com>
PiperOrigin-RevId: 345261790
-rw-r--r-- | .travis.yml | 14 | ||||
-rwxr-xr-x | ci/env-osx.sh | 16 | ||||
-rwxr-xr-x | ci/install-osx.sh | 3 | ||||
-rwxr-xr-x | ci/log-config.sh | 4 | ||||
-rw-r--r-- | googlemock/docs/cheat_sheet.md | 2 | ||||
-rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 1 | ||||
-rwxr-xr-x | googletest/test/gtest_test_utils.py | 4 |
7 files changed, 17 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index d7b23b94..45a5df82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,17 +26,19 @@ matrix: - os: linux dist: bionic compiler: gcc - env: BUILD_TYPE=Debug VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" + env: BUILD_TYPE=Debug CXX_FLAGS="-std=c++11 -Wdeprecated" - os: linux dist: bionic compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON + env: BUILD_TYPE=Release CXX_FLAGS="-std=c++11 -Wdeprecated" NO_EXCEPTION=ON NO_RTTI=ON COMPILER_IS_GNUCXX=ON - os: osx + osx_image: xcode12.2 compiler: gcc - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp + env: BUILD_TYPE=Release CC=gcc-10 CXX=g++-10 CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp - os: osx + osx_image: xcode12.2 compiler: clang - env: BUILD_TYPE=Release VERBOSE=1 CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp + env: BUILD_TYPE=Release CXX_FLAGS="-std=c++11 -Wdeprecated" HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp # These are the install and build (script) phases for the most common entries in the matrix. They could be included # in each entry in the matrix, but that is just repetitive. @@ -56,9 +58,7 @@ addons: update: true homebrew: packages: - - ccache - - gcc@4.9 - - llvm@4 + - gcc@10 update: true notifications: diff --git a/ci/env-osx.sh b/ci/env-osx.sh index 9c421e14..fd4239fe 100755 --- a/ci/env-osx.sh +++ b/ci/env-osx.sh @@ -33,15 +33,9 @@ # This file should be sourced, and not executed as a standalone script. # -# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}. -# - -if [ "${TRAVIS_OS_NAME}" = "osx" ]; then - if [ "$CXX" = "clang++" ]; then - # $PATH needs to be adjusted because the llvm tap doesn't install the - # package to /usr/local/bin, etc, like the gcc tap does. - # See: https://github.com/Homebrew/legacy-homebrew/issues/29733 - clang_version=3.9 - export PATH="/usr/local/opt/llvm@${clang_version}/bin:$PATH"; - fi +if [ "${TRAVIS_OS_NAME}" != "osx" ]; then + echo "Not a macOS build; skipping" + exit 0 fi + +# This file is currently intentionally empty. diff --git a/ci/install-osx.sh b/ci/install-osx.sh index cc475082..c81c33ca 100755 --- a/ci/install-osx.sh +++ b/ci/install-osx.sh @@ -36,5 +36,4 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then exit 0 fi -brew update -brew install ccache gcc@4.9 +# This file is currently intentionally empty. diff --git a/ci/log-config.sh b/ci/log-config.sh index 5fef1194..c76c49ad 100755 --- a/ci/log-config.sh +++ b/ci/log-config.sh @@ -31,10 +31,6 @@ set -e -# ccache on OS X needs installation first -# reset ccache statistics -ccache --zero-stats - echo PATH=${PATH} echo "Compiler configuration:" diff --git a/googlemock/docs/cheat_sheet.md b/googlemock/docs/cheat_sheet.md index e6cffd0c..bcb4ce94 100644 --- a/googlemock/docs/cheat_sheet.md +++ b/googlemock/docs/cheat_sheet.md @@ -540,7 +540,7 @@ which must be a permanent callback. | `DeleteArg<N>()` | Delete the `N`-th (0-based) argument, which must be a pointer. | | `SaveArg<N>(pointer)` | Save the `N`-th (0-based) argument to `*pointer`. | | `SaveArgPointee<N>(pointer)` | Save the value pointed to by the `N`-th (0-based) argument to `*pointer`. | -| `SetArgReferee<N>(value)` | Assign value to the variable referenced by the `N`-th (0-based) argument. | +| `SetArgReferee<N>(value)` | Assign `value` to the variable referenced by the `N`-th (0-based) argument. | | `SetArgPointee<N>(value)` | Assign `value` to the variable pointed by the `N`-th (0-based) argument. | | `SetArgumentPointee<N>(value)` | Same as `SetArgPointee<N>(value)`. Deprecated. Will be removed in v1.7.0. | | `SetArrayArgument<N>(first, last)` | Copies the elements in source range [`first`, `last`) to the array pointed to by the `N`-th (0-based) argument, which can be either a pointer or an iterator. The action does not take ownership of the elements in the source range. | diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index d3239b25..813bf2c6 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -68,6 +68,7 @@ # define GTEST_OS_OS2 1 #elif defined __APPLE__ # define GTEST_OS_MAC 1 +# include <TargetConditionals.h> # if TARGET_OS_IPHONE # define GTEST_OS_IOS 1 # endif diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py index ef9363c3..64ed09eb 100755 --- a/googletest/test/gtest_test_utils.py +++ b/googletest/test/gtest_test_utils.py @@ -289,10 +289,10 @@ class Subprocess: else: # os.WIFEXITED(ret_code) should return True here. self._return_code = os.WEXITSTATUS(ret_code) - if self._return_code < 0: + if bool(self._return_code & 0x80000000): self.terminated_by_signal = True self.exited = False - self.signal = -self._return_code + self.signal = self._return_code & 0x7fffffff else: self.terminated_by_signal = False self.exited = True |