Merge pull request #4227 from Vertexwahn:fix-spelling

PiperOrigin-RevId: 528474013
Change-Id: I60cd509aded8d8b02423ea1b07c2c27e3709a808
pull/4146/head^2
Copybara-Service 2 years ago
commit f345b2ca6a
  1. 2
      googletest/src/gtest-death-test.cc
  2. 2
      googletest/src/gtest-internal-inl.h
  3. 2
      googletest/test/googletest-filepath-test.cc
  4. 2
      googletest/test/gtest_xml_test_utils.py

@ -1029,7 +1029,7 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() {
// Note: The test component must have `fuchsia.process.Launcher` declared // Note: The test component must have `fuchsia.process.Launcher` declared
// in its manifest. (Fuchsia integration tests require creating a // in its manifest. (Fuchsia integration tests require creating a
// "Fuchsia Test Component" which contains a "Fuchsia Component Manifest") // "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. // declaration indicates that the ability is required for the component.
std::unique_ptr<char*[]> argv = CreateArgvFromArgs(args); std::unique_ptr<char*[]> argv = CreateArgvFromArgs(args);
status = fdio_spawn_etc(child_job, FDIO_SPAWN_CLONE_ALL, argv[0], argv.get(), status = fdio_spawn_etc(child_job, FDIO_SPAWN_CLONE_ALL, argv[0], argv.get(),

@ -93,7 +93,7 @@ GTEST_API_ TimeInMillis GetTimeInMillis();
GTEST_API_ bool ShouldUseColor(bool stdout_is_tty); GTEST_API_ bool ShouldUseColor(bool stdout_is_tty);
// Formats the given time in milliseconds as seconds. If the input is an exact N // 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); GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms);
// Converts the given time in milliseconds to a date string in the ISO 8601 // Converts the given time in milliseconds to a date string in the ISO 8601

@ -515,7 +515,7 @@ class DirectoryCreationTest : public Test {
} }
// Strings representing a directory and a file, with identical paths // Strings representing a directory and a file, with identical paths
// except for the trailing separator character that distinquishes // except for the trailing separator character that distinguishes
// a directory named 'test' from a file named 'test'. Example names: // a directory named 'test' from a file named 'test'. Example names:
FilePath testdata_path_; // "/tmp/directory_creation/test/" FilePath testdata_path_; // "/tmp/directory_creation/test/"
FilePath testdata_file_; // "/tmp/directory_creation/test" FilePath testdata_file_; // "/tmp/directory_creation/test"

@ -218,7 +218,7 @@ class GTestXMLTestCase(gtest_test_utils.TestCase):
) )
if element.tagName in ('testsuites', 'testsuite', 'testcase'): if element.tagName in ('testsuites', 'testsuite', 'testcase'):
time = element.getAttributeNode('time') time = element.getAttributeNode('time')
# The value for exact N seconds has a traling decimal point (e.g., "10." # The value for exact N seconds has a trailing decimal point (e.g., "10."
# instead of "10") # instead of "10")
time.value = re.sub(r'^\d+\.(\d+)?$', '*', time.value) time.value = re.sub(r'^\d+\.(\d+)?$', '*', time.value)
type_param = element.getAttributeNode('type_param') type_param = element.getAttributeNode('type_param')

Loading…
Cancel
Save