base64: fix for unsigned chars (e.g. ARM).

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

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index 2af2c7eebab773c770f21f7ae4a63bce81cfe97e..cea678f3806ded21d7636bf3f3380ebe67e3ca02 100644 (file)
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -4,31 +4,33 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include "utils.h"
+
+/* Ensure width is sane. */
+static const char *getenv_override(const char *name UNNEEDED)
+{
+       return "100";
+}
+
+#define getenv getenv_override
+
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
 #include <ccan/opt/helpers.c>
 #include <ccan/opt/parse.c>
 
-static char *my_cb(void *p)
+static char *my_cb(void *p UNNEEDED)
 {
        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[])
+int main(void)
 {
        char *output;
        char *longname = strdup("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
        char *shortname = strdup("shortname");
 
-       plan_tests(48);
+       plan_tests(51);
        opt_register_table(subtables, NULL);
        opt_register_noarg("--kkk|-k", my_cb, NULL, "magic kkk option");
        opt_register_noarg("-?", opt_usage_and_exit, "<MyArgs>...",
@@ -106,6 +108,23 @@ 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.");
+       opt_register_noarg("--split", my_cb, NULL, "New line in\nlong 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\n"
+                  "         shown in the usage message.\n"));
+       ok1(strstr(output, "\n"
+                  "--split  New line in\n"
+                  "         long option which requires more than one line for its full description to be shown in the\n"
+                  "         usage message.\n"));
+       free(output);
+
        free(shortname);
        free(longname);
        return exit_status();