X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-usage.c;h=2af2c7eebab773c770f21f7ae4a63bce81cfe97e;hp=dd5e42e72ce4bf3911ec09b09fe2e5b641c00c27;hb=74257cee33ae3033f961d5f22a0313b8cb1b18d4;hpb=9056c31b46452c92c7dd9c276664f514720a84c6

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index dd5e42e7..2af2c7ee 100644
--- 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>
@@ -26,12 +25,18 @@ static void reset_options(void)
 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 +82,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 +106,7 @@ int main(int argc, char *argv[])
 	ok1(strstr(output, "AAAAll"));
 	free(output);
 
+	free(shortname);
+	free(longname);
 	return exit_status();
 }