Commit 43ff1a67 by Abseil Team Committed by vslashg

Googletest export

- 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
parent b1fbd33c
...@@ -26,17 +26,19 @@ matrix: ...@@ -26,17 +26,19 @@ matrix:
- os: linux - os: linux
dist: bionic dist: bionic
compiler: gcc 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 - os: linux
dist: bionic dist: bionic
compiler: clang 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 - os: osx
osx_image: xcode12.2
compiler: gcc 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 - os: osx
osx_image: xcode12.2
compiler: clang 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 # 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. # in each entry in the matrix, but that is just repetitive.
...@@ -56,9 +58,7 @@ addons: ...@@ -56,9 +58,7 @@ addons:
update: true update: true
homebrew: homebrew:
packages: packages:
- ccache - gcc@10
- gcc@4.9
- llvm@4
update: true update: true
notifications: notifications:
......
...@@ -33,15 +33,9 @@ ...@@ -33,15 +33,9 @@
# This file should be sourced, and not executed as a standalone script. # 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
# echo "Not a macOS build; skipping"
exit 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
fi fi
# This file is currently intentionally empty.
...@@ -36,5 +36,4 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then ...@@ -36,5 +36,4 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
exit 0 exit 0
fi fi
brew update # This file is currently intentionally empty.
brew install ccache gcc@4.9
...@@ -31,10 +31,6 @@ ...@@ -31,10 +31,6 @@
set -e set -e
# ccache on OS X needs installation first
# reset ccache statistics
ccache --zero-stats
echo PATH=${PATH} echo PATH=${PATH}
echo "Compiler configuration:" echo "Compiler configuration:"
......
...@@ -540,7 +540,7 @@ which must be a permanent callback. ...@@ -540,7 +540,7 @@ which must be a permanent callback.
| `DeleteArg<N>()` | Delete the `N`-th (0-based) argument, which must be a pointer. | | `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`. | | `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`. | | `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. | | `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. | | `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. | | `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. |
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
# define GTEST_OS_OS2 1 # define GTEST_OS_OS2 1
#elif defined __APPLE__ #elif defined __APPLE__
# define GTEST_OS_MAC 1 # define GTEST_OS_MAC 1
# include <TargetConditionals.h>
# if TARGET_OS_IPHONE # if TARGET_OS_IPHONE
# define GTEST_OS_IOS 1 # define GTEST_OS_IOS 1
# endif # endif
......
...@@ -289,10 +289,10 @@ class Subprocess: ...@@ -289,10 +289,10 @@ class Subprocess:
else: # os.WIFEXITED(ret_code) should return True here. else: # os.WIFEXITED(ret_code) should return True here.
self._return_code = os.WEXITSTATUS(ret_code) self._return_code = os.WEXITSTATUS(ret_code)
if self._return_code < 0: if bool(self._return_code & 0x80000000):
self.terminated_by_signal = True self.terminated_by_signal = True
self.exited = False self.exited = False
self.signal = -self._return_code self.signal = self._return_code & 0x7fffffff
else: else:
self.terminated_by_signal = False self.terminated_by_signal = False
self.exited = True self.exited = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment