opt: neaten tests with helpers.

[ccan] / ccan / opt / test / run-usage.c

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index dd5e42e72ce4bf3911ec09b09fe2e5b641c00c27..fa1dc64c112fe46dc36e02cc4b140de50681372c 100644 (file)
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -1,4 +1,3 @@
-#define _GNU_SOURCE
 #include <ccan/tap/tap.h>
 #include <stdarg.h>
 #include <setjmp.h>
@@ -15,23 +14,22 @@ static char *my_cb(void *p)
        return NULL;
 }
 
-static void reset_options(void)
-{
-       free(opt_table);
-       opt_table = NULL;
-       opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
-}
-
 /* Test helpers. */
 int main(int argc, char *argv[])
 {
        char *output;
+       char *longname = strdup("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+       char *shortname = strdup("shortname");
 
-       plan_tests(42);
+       plan_tests(48);
        opt_register_table(subtables, NULL);
        opt_register_noarg("--kkk|-k", my_cb, NULL, "magic kkk option");
        opt_register_noarg("-?", opt_usage_and_exit, "<MyArgs>...",
                           "This message");
+       opt_register_arg("--longname", opt_set_charp, opt_show_charp,
+                        &longname, "a really long option default");
+       opt_register_arg("--shortname", opt_set_charp, opt_show_charp,
+                        &shortname, "a short option default");
        output = opt_usage("my name", "ExTrA Args");
        diag("%s", output);
        ok1(strstr(output, "Usage: my name"));
@@ -77,6 +75,12 @@ int main(int argc, char *argv[])
        ok1(strstr(output, " Description of hhh\n"));
        ok1(strstr(output, "--kkk|-k"));
        ok1(strstr(output, "magic kkk option"));
+       ok1(strstr(output, "--longname"));
+       ok1(strstr(output, "a really long option default"));
+       ok1(strstr(output, "(default: \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"...)"));
+       ok1(strstr(output, "--shortname"));
+       ok1(strstr(output, "a short option default"));
+       ok1(strstr(output, "(default: \"shortname\")"));
        /* This entry is hidden. */
        ok1(!strstr(output, "--mmm|-m"));
        free(output);
@@ -95,5 +99,7 @@ int main(int argc, char *argv[])
        ok1(strstr(output, "AAAAll"));
        free(output);
 
+       free(shortname);
+       free(longname);
        return exit_status();
 }