summaryrefslogtreecommitdiffstats
path: root/googletest/src
diff options
context:
space:
mode:
authorCopybara-Service <copybara-worker@google.com>2023-05-01 15:05:40 (GMT)
committerCopybara-Service <copybara-worker@google.com>2023-05-01 15:05:40 (GMT)
commitf345b2ca6adb1b505049190867eedf24d3b5eaa3 (patch)
tree88152ba746908fafd5c30535831376c8eb470642 /googletest/src
parent797b0ad2a3a45608ecf5c67e6e289d377a3521ca (diff)
parent97408cae552bde8609aabfa7c3647a52fb21f8c9 (diff)
downloadgoogletest-f345b2ca6adb1b505049190867eedf24d3b5eaa3.zip
googletest-f345b2ca6adb1b505049190867eedf24d3b5eaa3.tar.gz
googletest-f345b2ca6adb1b505049190867eedf24d3b5eaa3.tar.bz2
Merge pull request #4227 from Vertexwahn:fix-spelling
PiperOrigin-RevId: 528474013 Change-Id: I60cd509aded8d8b02423ea1b07c2c27e3709a808
Diffstat (limited to 'googletest/src')
-rw-r--r--googletest/src/gtest-death-test.cc2
-rw-r--r--googletest/src/gtest-internal-inl.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 55b9578..c3b7820 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -1029,7 +1029,7 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
// Note: The test component must have `fuchsia.process.Launcher` declared
// in its manifest. (Fuchsia integration tests require creating a
// "Fuchsia Test Component" which contains a "Fuchsia Component Manifest")
- // Launching processes is a privileged operation in Fuschia, and the
+ // Launching processes is a privileged operation in Fuchsia, and the
// declaration indicates that the ability is required for the component.
std::unique_ptr<char*[]> argv = CreateArgvFromArgs(args);
status = fdio_spawn_etc(child_job, FDIO_SPAWN_CLONE_ALL, argv[0], argv.get(),
diff --git a/googletest/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h
index 0084971..5ba557f 100644
--- a/googletest/src/gtest-internal-inl.h
+++ b/googletest/src/gtest-internal-inl.h
@@ -93,7 +93,7 @@ GTEST_API_ TimeInMillis GetTimeInMillis();
GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
// Formats the given time in milliseconds as seconds. If the input is an exact N
-// seconds, the output has a trailing decimal point (e.g., "N." intead of "N").
+// seconds, the output has a trailing decimal point (e.g., "N." instead of "N").
GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
// Converts the given time in milliseconds to a date string in the ISO 8601