Merge pull request #5005 from tejas-sharma27:fix-help-missing-flags

PiperOrigin-RevId: 943911159
Change-Id: I42c77c8ec667c37032563c92e4b8190473892b77

googletest/src/gtest.cc

@@ -6732,6 +6732,12 @@ static const char kColorEncodedHelpMessage[] =
     "recreate_environments_when_repeating@D\n"
     "      Sets up and tears down the global test environment on each repeat\n"
     "      of the test.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "fail_fast@D\n"
+    "      Stop running tests after the first failure.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "fail_if_no_test_linked@D\n"
+    "      Fail if no test is linked into the test program.\n"
     "\n"
     "Test Output:\n"
     "  @G--" GTEST_FLAG_PREFIX_
@@ -6744,6 +6750,9 @@ static const char kColorEncodedHelpMessage[] =
     "print_time=0@D\n"
     "      Don't print the elapsed time of each test.\n"
     "  @G--" GTEST_FLAG_PREFIX_
+    "print_utf8=0@D\n"
+    "      Don't print UTF-8 characters as text.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
     "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" GTEST_PATH_SEP_
     "@Y|@G:@YFILE_PATH]@D\n"
     "      Generate a JSON or XML report in the given directory or with the "
@@ -6760,6 +6769,9 @@ static const char kColorEncodedHelpMessage[] =
     "  @G--" GTEST_FLAG_PREFIX_
     "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n"
     "      Set the default death test style.\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "death_test_use_fork@D\n"
+    "      Use fork() instead of clone() to spawn death test child processes.\n"
 #endif  // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS
     "  @G--" GTEST_FLAG_PREFIX_
     "break_on_failure@D\n"
@@ -6772,6 +6784,9 @@ static const char kColorEncodedHelpMessage[] =
     "catch_exceptions=0@D\n"
     "      Do not report exceptions as test failures. Instead, allow them\n"
     "      to crash the program or throw a pop-up (on Windows).\n"
+    "  @G--" GTEST_FLAG_PREFIX_
+    "stack_trace_depth=@Y[NUMBER]@D\n"
+    "      Maximum number of stack frames to print when an assertion fails.\n"
     "\n"
     "Except for @G--" GTEST_FLAG_PREFIX_
     "list_tests@D, you can alternatively set "

googletest/test/gtest_help_test.py

@@ -64,6 +64,7 @@ IS_WINDOWS = os.name == 'nt'
 PROGRAM_PATH = gtest_test_utils.GetTestExecutablePath('gtest_help_test_')
 FLAG_PREFIX = '--gtest_'
 DEATH_TEST_STYLE_FLAG = FLAG_PREFIX + 'death_test_style'
+DEATH_TEST_USE_FORK_FLAG = FLAG_PREFIX + 'death_test_use_fork'
 STREAM_RESULT_TO_FLAG = FLAG_PREFIX + 'stream_result_to'
 LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
 INTERNAL_FLAG_FOR_TESTING = FLAG_PREFIX + 'internal_flag_for_testing'
@@ -90,19 +91,27 @@ HELP_REGEX = re.compile(
     + FLAG_PREFIX
     + r'random_seed=.*'
     + FLAG_PREFIX
+    + r'fail_fast.*'
+    + FLAG_PREFIX
+    + r'fail_if_no_test_linked.*'
+    + FLAG_PREFIX
     + r'color=.*'
     + FLAG_PREFIX
     + r'brief.*'
     + FLAG_PREFIX
     + r'print_time.*'
     + FLAG_PREFIX
+    + r'print_utf8.*'
+    + FLAG_PREFIX
     + r'output=.*'
     + FLAG_PREFIX
     + r'break_on_failure.*'
     + FLAG_PREFIX
     + r'throw_on_failure.*'
     + FLAG_PREFIX
-    + r'catch_exceptions=0.*',
+    + r'catch_exceptions=0.*'
+    + FLAG_PREFIX
+    + r'stack_trace_depth=.*',
     re.DOTALL,
 )
 
@@ -151,8 +160,10 @@ class GTestHelpTest(gtest_test_utils.TestCase):
 
     if SUPPORTS_DEATH_TESTS and not IS_WINDOWS:
       self.assertIn(DEATH_TEST_STYLE_FLAG, output)
+      self.assertIn(DEATH_TEST_USE_FORK_FLAG, output)
     else:
       self.assertNotIn(DEATH_TEST_STYLE_FLAG, output)
+      self.assertNotIn(DEATH_TEST_USE_FORK_FLAG, output)
 
   def test_runs_tests_without_help_flag(self):
     """Verifies correct behavior when no help flag is specified.