diff options
Diffstat (limited to 'utils')
4 files changed, 9 insertions, 7 deletions
diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index b0c771579802..b597d5f45ad8 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -568,17 +568,17 @@ done ) 2>&1 | tee $LogDir/testing.$Release-$RC.log +if [ "$use_gzip" = "yes" ]; then + echo "# Packaging the release as $Package.tar.gz" +else + echo "# Packaging the release as $Package.tar.xz" +fi package_release set +e # Woo hoo! echo "### Testing Finished ###" -if [ "$use_gzip" = "yes" ]; then - echo "### Package: $Package.tar.gz" -else - echo "### Package: $Package.tar.xz" -fi echo "### Logs: $LogDir" echo "### Errors:" diff --git a/utils/unittest/googletest/README.LLVM b/utils/unittest/googletest/README.LLVM index 06c80fea0670..99d0bc5b7ae0 100644 --- a/utils/unittest/googletest/README.LLVM +++ b/utils/unittest/googletest/README.LLVM @@ -16,5 +16,5 @@ $ rm -f src/gtest_main.cc $ mv LICENSE LICENSE.TXT Modified as follows: -* Added support for Minix and Haiku. +* Added support for NetBSD, Minix and Haiku. * Added raw_os_ostream support to include/gtest/internal/custom/gtest-printers.h. 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 a375b73799b7..f1319c7f2e29 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 8762f974ef8d..d36e8203bcc3 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 |