diff options
| author | Alexey Samsonov <samsonov@google.com> | 2014-02-19 15:18:30 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2014-02-19 15:18:30 +0000 |
| commit | 9225ba31deb31b9c79c1407e290d0106b58d6490 (patch) | |
| tree | f72ccb91cf58ebb1e163e5f46259efb65eda1a92 /llvm/utils/unittest/googletest | |
| parent | 4d4f3d98deb799c9eb1ba93ad02a46e9b206f02d (diff) | |
| download | bcm5719-llvm-9225ba31deb31b9c79c1407e290d0106b58d6490.tar.gz bcm5719-llvm-9225ba31deb31b9c79c1407e290d0106b58d6490.zip | |
Support GTest for FreeBSD platforms (9.x)
Patch by Viktor Kutuzov!
llvm-svn: 201683
Diffstat (limited to 'llvm/utils/unittest/googletest')
| -rw-r--r-- | llvm/utils/unittest/googletest/README.LLVM | 1 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/llvm/utils/unittest/googletest/README.LLVM b/llvm/utils/unittest/googletest/README.LLVM index 1a6f0f59f1d..16bfffd8d5e 100644 --- a/llvm/utils/unittest/googletest/README.LLVM +++ b/llvm/utils/unittest/googletest/README.LLVM @@ -16,6 +16,7 @@ $ rm -f src/gtest_main.cc $ mv COPYING LICENSE.TXT Modified as follows: +* Added support for FreeBSD. * To GTestStreamToHelper in include/gtest/internal/gtest-internal.h, added the ability to stream with raw_os_ostream. * To refresh Haiku support in include/gtest/internal/gtest-port.h, diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 32fd9c65bfe..f5bfd4e1d2e 100644 --- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -86,6 +86,7 @@ // the given platform; otherwise undefined): // GTEST_OS_AIX - IBM AIX // GTEST_OS_CYGWIN - Cygwin +// GTEST_OS_FREEBSD - FreeBSD // GTEST_OS_HAIKU - Haiku // GTEST_OS_HPUX - HP-UX // GTEST_OS_LINUX - Linux @@ -228,6 +229,8 @@ # endif // _WIN32_WCE #elif defined __APPLE__ # define GTEST_OS_MAC 1 +#elif defined __FreeBSD__ +# define GTEST_OS_FREEBSD 1 #elif defined __linux__ # define GTEST_OS_LINUX 1 # if defined(ANDROID) || defined(__ANDROID__) @@ -421,7 +424,8 @@ // // 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) +# define GTEST_HAS_PTHREAD (GTEST_OS_LINUX || GTEST_OS_MAC || \ + GTEST_OS_HPUX || GTEST_OS_FREEBSD) #endif // GTEST_HAS_PTHREAD #if GTEST_HAS_PTHREAD @@ -545,7 +549,8 @@ // pops up a dialog window that cannot be suppressed programmatically. #if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ - GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX) + GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || \ + GTEST_OS_HPUX || GTEST_OS_FREEBSD) # define GTEST_HAS_DEATH_TEST 1 # include <vector> // NOLINT #endif |
