Bug 550433 – g_test_init doesn't recognize --help

* glib/gtestutils.c (parse_args): Add detailed --help output

svn path=/trunk/; revision=7442

diff --git a/ChangeLog b/ChangeLog
index 45ad19b80c71e990be0c81a891cb229b64670df6..3590fb848c8532475499fd466a3b23d7ecfabdd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-08  Christian Dywan  <christian@imendio.com>
+
+       Bug 550433 – g_test_init doesn't recognize --help
+
+       * glib/gtestutils.c (parse_args): Add detailed --help output
+
 2008-09-02  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 8c0eb1ff36dc6a2bd4424ab0395f667d8bfca845..179a3d78ecf8e753049e47fd7ff7cbd39d14a539 100644 (file)
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -228,6 +228,9 @@ g_test_log (GTestLogType lbit,
     }
 }
 
+/* We intentionally parse the command line without GOptionContext
+ * because otherwise you would never be able to test it.
+ */
 static void
 parse_args (gint    *argc_p,
             gchar ***argv_p)
@@ -347,6 +350,27 @@ parse_args (gint    *argc_p,
             }
           argv[i] = NULL;
         }
+      else if (strcmp ("-?", argv[i]) == 0 || strcmp ("--help", argv[i]) == 0)
+        {
+          printf ("Usage:\n"
+                  "  %s [OPTION...]\n\n"
+                  "Help Options:\n"
+                  "  -?, --help                     Show help options\n"
+                  "Test Options:\n"
+                  "  -l                             List test cases available in a test executable\n"
+                  "  -seed=RANDOMSEED               Provide a random seed to reproduce test\n"
+                  "                                 runs using random numbers\n"
+                  "  --verbose                      Run tests verbosely\n"
+                  "  -q, --quiet                    Run tests quietly\n"
+                  "  -p TESTPATH                    execute all tests matching TESTPATH\n"
+                  "  -m {perf|slow|thorough|quick}  Execute tests according modes\n"
+                  "  --debug-log                    debug test logging output\n"
+                  "  -k, --keep-going               gtester-specific argument\n"
+                  "  --GTestLogFD=N                 gtester-specific argument\n"
+                  "  --GTestSkipCount=N             gtester-specific argument\n",
+                  argv[0]);
+          exit (0);
+        }
     }
   /* collapse argv */
   e = 1;