X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-usage.c;h=60df988c97bdcb6f2163aad172723740dbabf094;hp=943fcf6da38e6efb5e3097af46f997a3d228a486;hb=0191b7a74144ea8193961235f45715e715d4d8eb;hpb=3e8aea05784959a63cdb609d248f8266b03b56a6

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index 943fcf6d..60df988c 100644
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -7,6 +7,7 @@
 #include "utils.h"
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
+#include <ccan/opt/helpers.c>
 
 static char *my_cb(void *p)
 {
@@ -18,9 +19,11 @@ int main(int argc, char *argv[])
 {
 	char *output;
 
-	plan_tests(19);
+	plan_tests(38);
 	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");
 	output = opt_usage("my name", "ExTrA Args");
 	diag("%s", output);
 	ok1(strstr(output, "Usage: my name"));
@@ -43,7 +46,31 @@ int main(int argc, char *argv[])
 	ok1(strstr(output, "magic kkk option"));
 	/* This entry is hidden. */
 	ok1(!strstr(output, "--mmm/-m"));
+	free(output);
 
+	/* NULL should use string from registered options. */
+	output = opt_usage("my name", NULL);
+	diag("%s", output);
+	ok1(strstr(output, "Usage: my name"));
+	ok1(strstr(output, "--jjj/-j/--lll/-l <arg>"));
+	ok1(strstr(output, "<MyArgs>..."));
+	ok1(strstr(output, "-a "));
+	ok1(strstr(output, " Description of a\n"));
+	ok1(strstr(output, "-b <arg>"));
+	ok1(strstr(output, " Description of b (default: b)\n"));
+	ok1(strstr(output, "--ddd "));
+	ok1(strstr(output, " Description of ddd\n"));
+	ok1(strstr(output, "--eee <filename> "));
+	ok1(strstr(output, " (default: eee)\n"));
+	ok1(strstr(output, "long table options:\n"));
+	ok1(strstr(output, "--ggg/-g "));
+	ok1(strstr(output, " Description of ggg\n"));
+	ok1(strstr(output, "-h/--hhh <arg>"));
+	ok1(strstr(output, " Description of hhh\n"));
+	ok1(strstr(output, "--kkk/-k"));
+	ok1(strstr(output, "magic kkk option"));
+	/* This entry is hidden. */
+	ok1(!strstr(output, "--mmm/-m"));
 	free(output);
 
 	return exit_status();