diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-08-31 08:47:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 08:47:26 +0200 |
| commit | d6c46ebd04e2e4f36fd799b43e2fd5342c10a891 (patch) | |
| tree | 54604d1522bdd3612f08a2a15c4fa6df59f14711 | |
| parent | cfcc89a84a6fbb76dae4e24522267a1d0a94d696 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-d6c46ebd04e2e4f36fd799b43e2fd5342c10a891.tar.gz googletest-d6c46ebd04e2e4f36fd799b43e2fd5342c10a891.tar.bz2 googletest-d6c46ebd04e2e4f36fd799b43e2fd5342c10a891.zip | |
Merge branch 'master' into hethi/issue-1175-cmake-build-type
| -rw-r--r-- | googletest/docs/DevGuide.md | 4 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 2 | ||||
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 6 | ||||
| -rwxr-xr-x | travis.sh | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/googletest/docs/DevGuide.md b/googletest/docs/DevGuide.md index 4333a8e0..88a3de9f 100644 --- a/googletest/docs/DevGuide.md +++ b/googletest/docs/DevGuide.md @@ -101,6 +101,10 @@ Please do submit code. Here's what you need to do: 1. Sign a Contributor License Agreement. 1. Create a Pull Request in the usual way. +If you are a Googler, it is preferable to first create an internal change and +have it reviewed and submitted, and then create an upstreaming pull +request here. + ## Google Test Committers ## The current members of the Google Test engineering team are the only diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index f32fc06b..bb206167 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -69,6 +69,8 @@ # endif #elif defined __FreeBSD__ # define GTEST_OS_FREEBSD 1 +#elif defined __Fuchsia__ +# define GTEST_OS_FUCHSIA 1 #elif defined __linux__ # define GTEST_OS_LINUX 1 # if defined __ANDROID__ diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index c2a9f5f3..643beff9 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -122,6 +122,7 @@ // GTEST_OS_AIX - IBM AIX // GTEST_OS_CYGWIN - Cygwin // GTEST_OS_FREEBSD - FreeBSD +// GTEST_OS_FUCHSIA - Fuchsia // GTEST_OS_HPUX - HP-UX // GTEST_OS_LINUX - Linux // GTEST_OS_LINUX_ANDROID - Google Android @@ -607,8 +608,9 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; // // To disable threading support in Google Test, add -DGTEST_HAS_PTHREAD=0 // to your compiler flags. -# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX \ - || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD) +#define GTEST_HAS_PTHREAD \ + (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_HPUX || GTEST_OS_QNX || \ + GTEST_OS_FREEBSD || GTEST_OS_NACL || GTEST_OS_NETBSD || GTEST_OS_FUCHSIA) #endif // GTEST_HAS_PTHREAD #if GTEST_HAS_PTHREAD @@ -5,7 +5,6 @@ env | sort mkdir build || true cd build cmake -Dgtest_build_samples=ON \ - -Dgmock_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ -DCMAKE_CXX_FLAGS=$CXX_FLAGS \ |