From 7b3685be8d7e2020e2c1eef419d3e1092bd6c5cc Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Fri, 5 May 2017 17:57:45 +0000 Subject: [PATCH] Add NetBSD to the list of platforms supporting death tests. Two unit tests require this for compilation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@302264 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../googletest/include/gtest/internal/gtest-port-arch.h | 2 ++ utils/unittest/googletest/include/gtest/internal/gtest-port.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h b/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h index a375b73799b..f1319c7f2e2 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port-arch.h @@ -84,6 +84,8 @@ # define GTEST_OS_HPUX 1 #elif defined __native_client__ # define GTEST_OS_NACL 1 +#elif defined __NetBSD__ +# define GTEST_OS_NETBSD 1 #elif defined __OpenBSD__ # define GTEST_OS_OPENBSD 1 #elif defined __QNX__ diff --git a/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 8762f974ef8..d36e8203bcc 100644 --- a/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -793,7 +793,7 @@ using ::std::tuple_size; (GTEST_OS_MAC && !GTEST_OS_IOS) || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX || GTEST_OS_HPUX || \ - GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD) + GTEST_OS_OPENBSD || GTEST_OS_QNX || GTEST_OS_FREEBSD || GTEST_OS_NETBSD) # define GTEST_HAS_DEATH_TEST 1 #endif -- 2.50.1