coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2026-02-07 10:19:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0cc9e85870e93ef6dcbdf0e4481c2d295309d277 into 9156d4caac880b513264ecbe0aa4746a3fead3d7

Browse Source
This commit is contained in:
Marcel Petrick 2025-12-16 10:23:36 -05:00 committed by GitHub
commit b24470eb47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/linux-presubmit.sh
View File

@ -40,7 +40,7 @@ fi
# Use Bazel Vendor mode to reduce reliance on external dependencies.
# See https://bazel.build/external/vendor and the Dockerfile for
# an explaination of how this works.
# an explanation of how this works.
if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f "${KOKORO_GFILE_DIR}/distdir/googletest_vendor.tar.gz" ]]; then
DOCKER_EXTRA_ARGS="--mount type=bind,source=${KOKORO_GFILE_DIR}/distdir,target=/distdir,readonly --env=BAZEL_VENDOR_ARCHIVE=/distdir/googletest_vendor.tar.gz ${DOCKER_EXTRA_ARGS:-}"
BAZEL_EXTRA_ARGS="--vendor_dir=/googletest_vendor ${BAZEL_EXTRA_ARGS:-}"

2
googletest/include/gtest/gtest-printers.h
View File

@ -1187,7 +1187,7 @@ void UniversalTersePrint(const T& value, ::std::ostream* os) {
// NUL-terminated string.
template <typename T>
void UniversalPrint(const T& value, ::std::ostream* os) {
// A workarond for the bug in VC++ 7.1 that prevents us from instantiating
// A workaround for the bug in VC++ 7.1 that prevents us from instantiating
// UniversalPrinter with T directly.
typedef T T1;
UniversalPrinter<T1>::Print(value, os);

2
googletest/include/gtest/internal/gtest-param-util.h
View File

@ -762,7 +762,7 @@ class [[nodiscard]] ParameterizedTestSuiteRegistry {
};
// Keep track of what type-parameterized test suite are defined and
// where as well as which are intatiated. This allows susequently
// where as well as which are intatiated. This allows subsequently
// identifying suits that are defined but never used.
class [[nodiscard]] TypeParameterizedTestSuiteRegistry {
public:

2
googletest/src/gtest-port.cc
View File

@ -712,7 +712,7 @@ bool RE::PartialMatch(const char* str, const RE& re) {
void RE::Init(const char* regex) {
pattern_ = regex;
// NetBSD (and Android, which takes its regex implemntation from NetBSD) does
// NetBSD (and Android, which takes its regex implementation from NetBSD) does
// not include the GNU regex extensions (such as Perl style character classes
// like \w) in REG_EXTENDED. REG_EXTENDED is only specified to include the
// [[:alpha:]] style character classes. Enable REG_GNU wherever it is defined