X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-usage.c;h=c647537058860e03e1cbf42ec6ff9f545b2d762b;hp=7d94ced219b59868883801cb26bd7f362019e4f7;hb=2e26b06e6384c4483dde844cf8991846075e552c;hpb=bf06b6e9a5385a0315d04308d8dc304ff54b29b0

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index 7d94ced2..c6475370 100644
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
 	char *longname = strdup("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 	char *shortname = strdup("shortname");
 
-	plan_tests(48);
+	plan_tests(50);
 	opt_register_table(subtables, NULL);
 	opt_register_noarg("--kkk|-k", my_cb, NULL, "magic kkk option");
 	opt_register_noarg("-?", opt_usage_and_exit, "<MyArgs>...",
@@ -108,6 +108,17 @@ int main(int argc, char *argv[])
 	ok1(strstr(output, "AAAAll"));
 	free(output);
 
+	reset_options();
+	/* Valgrind nails this to 100 anyway :( */
+	setenv("COLUMNS", "100", 1);
+	opt_register_noarg("--long", my_cb, NULL, "Extremely long option which requires more than one line for its full description to be shown in the usage message.");
+	output = opt_usage("longarg", NULL);
+	diag("%s", output);
+	ok1(strstr(output, "Usage: longarg \n"));
+	ok1(strstr(output, "\n--long  Extremely long option which requires more than one line for its full description to be shown\n"
+		   "        in the usage message.\n"));
+	free(output);
+
 	free(shortname);
 	free(longname);
 	return exit_status();