summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authordinord <dino.radakovich@gmail.com>2021-10-05 14:59:42 (GMT)
committerdinord <dino.radakovich@gmail.com>2021-10-05 14:59:42 (GMT)
commit075810f7a20405ea09a93f68847d6e963212fa62 (patch)
treeb4e370b5ec2782a003496ea36706f0266f8dee57 /googletest
parent3b49be074d5c1340eeb447e6a8e78427051e675a (diff)
parentee1be03b43dd78916a0a2118c6e31090fdaed286 (diff)
downloadgoogletest-075810f7a20405ea09a93f68847d6e963212fa62.zip
googletest-075810f7a20405ea09a93f68847d6e963212fa62.tar.gz
googletest-075810f7a20405ea09a93f68847d6e963212fa62.tar.bz2
Merge pull request #3581 from cclauss:codespell
PiperOrigin-RevId: 400792845
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/internal/gtest-internal.h4
-rw-r--r--googletest/include/gtest/internal/gtest-port.h4
-rwxr-xr-xgoogletest/test/gtest_test_utils.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
index 02e0198..4e66667 100644
--- a/googletest/include/gtest/internal/gtest-internal.h
+++ b/googletest/include/gtest/internal/gtest-internal.h
@@ -508,11 +508,11 @@ inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
template <typename T>
// Note that SuiteApiResolver inherits from T because
-// SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
+// SetUpTestSuite()/TearDownTestSuite() could be protected. This way
// SuiteApiResolver can access them.
struct SuiteApiResolver : T {
// testing::Test is only forward declared at this point. So we make it a
- // dependend class for the compiler to be OK with it.
+ // dependent class for the compiler to be OK with it.
using Test =
typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
index 790fdd8..d3eab57 100644
--- a/googletest/include/gtest/internal/gtest-port.h
+++ b/googletest/include/gtest/internal/gtest-port.h
@@ -994,7 +994,7 @@ inline void FlushInfoLog() { fflush(nullptr); }
//
// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
// is not satisfied.
-// Synopsys:
+// Synopsis:
// GTEST_CHECK_(boolean_condition);
// or
// GTEST_CHECK_(boolean_condition) << "Additional message";
@@ -1049,7 +1049,7 @@ struct ConstRef<T&> { typedef T& type; };
// const Foo*). When you use ImplicitCast_, the compiler checks that
// the cast is safe. Such explicit ImplicitCast_s are necessary in
// surprisingly many situations where C++ demands an exact type match
-// instead of an argument type convertable to a target type.
+// instead of an argument type convertible to a target type.
//
// The syntax for using ImplicitCast_ is the same as for static_cast:
//
diff --git a/googletest/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py
index c7f25aa..13fc6f5 100755
--- a/googletest/test/gtest_test_utils.py
+++ b/googletest/test/gtest_test_utils.py
@@ -224,7 +224,7 @@ class Subprocess:
combined in a string.
"""
- # The subprocess module is the preferrable way of running programs
+ # The subprocess module is the preferable way of running programs
# since it is available and behaves consistently on all platforms,
# including Windows. But it is only available starting in python 2.4.
# In earlier python versions, we revert to the popen2 module, which is