ttxml: removed cruft from tests

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

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index 37e8993fe8bde451bdbf713ba65c222e2b623171..7d94ced219b59868883801cb26bd7f362019e4f7 100644 (file)
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -1,10 +1,18 @@
-#define _GNU_SOURCE
 #include <ccan/tap/tap.h>
 #include <stdarg.h>
 #include <setjmp.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include "utils.h"
+
+/* Ensure width is sane. */
+static const char *getenv_override(const char *name)
+{
+       return "100";
+}
+
+#define getenv getenv_override
+
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
 #include <ccan/opt/helpers.c>
@@ -15,13 +23,6 @@ static char *my_cb(void *p)
        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[])
 {
@@ -107,5 +108,7 @@ int main(int argc, char *argv[])
        ok1(strstr(output, "AAAAll"));
        free(output);
 
+       free(shortname);
+       free(longname);
        return exit_status();
 }