From 2e26b06e6384c4483dde844cf8991846075e552c Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 11 Feb 2014 13:06:24 +1030 Subject: [PATCH 1/1] ccan: add test for line-wrapping usage message. Signed-off-by: Rusty Russell --- ccan/opt/test/run-usage.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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, "...", @@ -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(); -- 2.39.2