opt: fix warnings with gcc and -O.

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

diff --git a/ccan/opt/test/run-helpers.c b/ccan/opt/test/run-helpers.c
index f8041ead39d1f73c3b095e0fb890db2ec886453a..91e66374bbaf42e7e688521165cc93c343426ed5 100644 (file)
--- a/ccan/opt/test/run-helpers.c
+++ b/ccan/opt/test/run-helpers.c
@@ -3,6 +3,7 @@
 #include <ccan/tap/tap.h>
 #include <setjmp.h>
 #include <stdlib.h>
 #include <ccan/tap/tap.h>
 #include <setjmp.h>
 #include <stdlib.h>

+#include <limits.h>

 #include "utils.h"
 
 /* We don't actually want it to exit... */
 #include "utils.h"
 
 /* We don't actually want it to exit... */


@@ -48,16 +49,16 @@ static int saved_printf(const char *fmt, ...)
 /* Test helpers. */
 int main(int argc, char *argv[])
 {
 /* Test helpers. */
 int main(int argc, char *argv[])
 {

-       plan_tests(88);
+       plan_tests(96);

 
        /* opt_set_bool */
        {
                bool arg = false;
                reset_options();
 
        /* opt_set_bool */
        {
                bool arg = false;
                reset_options();

-               opt_register_noarg("-a", opt_set_bool, &arg, NULL);
+               opt_register_noarg("-a", opt_set_bool, &arg, "");

                ok1(parse_args(&argc, &argv, "-a", NULL));
                ok1(arg);
                ok1(parse_args(&argc, &argv, "-a", NULL));
                ok1(arg);

-               opt_register_arg("-b", opt_set_bool_arg, NULL, &arg, NULL);
+               opt_register_arg("-b", opt_set_bool_arg, NULL, &arg, "");

                ok1(parse_args(&argc, &argv, "-b", "no", NULL));
                ok1(!arg);
                ok1(parse_args(&argc, &argv, "-b", "yes", NULL));
                ok1(parse_args(&argc, &argv, "-b", "no", NULL));
                ok1(!arg);
                ok1(parse_args(&argc, &argv, "-b", "yes", NULL));


@@ -66,16 +67,19 @@ int main(int argc, char *argv[])
                ok1(!arg);
                ok1(parse_args(&argc, &argv, "-b", "true", NULL));
                ok1(arg);
                ok1(!arg);
                ok1(parse_args(&argc, &argv, "-b", "true", NULL));
                ok1(arg);

+               ok1(!parse_args(&argc, &argv, "-b", "unknown", NULL));
+               ok1(arg);
+               ok1(strstr(err_output, ": -b: Invalid argument 'unknown'"));

        }
        /* opt_set_invbool */
        {
                bool arg = true;
                reset_options();
        }
        /* opt_set_invbool */
        {
                bool arg = true;
                reset_options();

-               opt_register_noarg("-a", opt_set_invbool, &arg, NULL);
+               opt_register_noarg("-a", opt_set_invbool, &arg, "");

                ok1(parse_args(&argc, &argv, "-a", NULL));
                ok1(!arg);
                opt_register_arg("-b", opt_set_invbool_arg, NULL,
                ok1(parse_args(&argc, &argv, "-a", NULL));
                ok1(!arg);
                opt_register_arg("-b", opt_set_invbool_arg, NULL,

-                                &arg, NULL);
+                                &arg, "");

                ok1(parse_args(&argc, &argv, "-b", "no", NULL));
                ok1(arg);
                ok1(parse_args(&argc, &argv, "-b", "yes", NULL));
                ok1(parse_args(&argc, &argv, "-b", "no", NULL));
                ok1(arg);
                ok1(parse_args(&argc, &argv, "-b", "yes", NULL));


@@ -84,12 +88,15 @@ int main(int argc, char *argv[])
                ok1(arg);
                ok1(parse_args(&argc, &argv, "-b", "true", NULL));
                ok1(!arg);
                ok1(arg);
                ok1(parse_args(&argc, &argv, "-b", "true", NULL));
                ok1(!arg);

+               ok1(!parse_args(&argc, &argv, "-b", "unknown", NULL));
+               ok1(!arg);
+               ok1(strstr(err_output, ": -b: Invalid argument 'unknown'"));

        }
        /* opt_set_charp */
        {
                char *arg = (char *)"wrong";
                reset_options();
        }
        /* opt_set_charp */
        {
                char *arg = (char *)"wrong";
                reset_options();

-               opt_register_arg("-a", opt_set_charp, NULL, &arg, NULL);
+               opt_register_arg("-a", opt_set_charp, NULL, &arg, "All");

                ok1(parse_args(&argc, &argv, "-a", "string", NULL));
                ok1(strcmp(arg, "string") == 0);
        }
                ok1(parse_args(&argc, &argv, "-a", "string", NULL));
                ok1(strcmp(arg, "string") == 0);
        }


@@ -97,7 +104,7 @@ int main(int argc, char *argv[])
        {
                int arg = 1000;
                reset_options();
        {
                int arg = 1000;
                reset_options();

-               opt_register_arg("-a", opt_set_intval, NULL, &arg, NULL);
+               opt_register_arg("-a", opt_set_intval, NULL, &arg, "All");

                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(parse_args(&argc, &argv, "-a", "-9999", NULL));
                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(parse_args(&argc, &argv, "-a", "-9999", NULL));


@@ -114,7 +121,7 @@ int main(int argc, char *argv[])
        {
                unsigned int arg = 1000;
                reset_options();
        {
                unsigned int arg = 1000;
                reset_options();

-               opt_register_arg("-a", opt_set_uintval, NULL, &arg, NULL);
+               opt_register_arg("-a", opt_set_uintval, NULL, &arg, "All");

                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(!parse_args(&argc, &argv, "-a", "-9999", NULL));
                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(!parse_args(&argc, &argv, "-a", "-9999", NULL));


@@ -122,12 +129,23 @@ int main(int argc, char *argv[])
                ok1(arg == 0);
                ok1(!parse_args(&argc, &argv, "-a", "100crap", NULL));
                ok1(!parse_args(&argc, &argv, "-a", "4294967296", NULL));
                ok1(arg == 0);
                ok1(!parse_args(&argc, &argv, "-a", "100crap", NULL));
                ok1(!parse_args(&argc, &argv, "-a", "4294967296", NULL));

+               if (ULONG_MAX == UINT_MAX) {
+                       pass("Can't test overflow");
+                       pass("Can't test error message");
+               } else {
+                       char buf[30];
+                       sprintf(buf, "%lu", ULONG_MAX);
+                       ok1(!parse_args(&argc, &argv, "-a", buf, NULL));
+                       ok1(strstr(err_output, ": -a: value '")
+                           && strstr(err_output, buf)
+                           && strstr(err_output, "' does not fit into an integer"));
+               }

        }
        /* opt_set_longval */
        {
                long int arg = 1000;
                reset_options();
        }
        /* opt_set_longval */
        {
                long int arg = 1000;
                reset_options();

-               opt_register_arg("-a", opt_set_longval, NULL, &arg, NULL);
+               opt_register_arg("-a", opt_set_longval, NULL, &arg, "All");

                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(parse_args(&argc, &argv, "-a", "-9999", NULL));
                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(parse_args(&argc, &argv, "-a", "-9999", NULL));


@@ -146,7 +164,7 @@ int main(int argc, char *argv[])
        {
                unsigned long int arg = 1000;
                reset_options();
        {
                unsigned long int arg = 1000;
                reset_options();

-               opt_register_arg("-a", opt_set_ulongval, NULL, &arg, NULL);
+               opt_register_arg("-a", opt_set_ulongval, NULL, &arg, "All");

                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(!parse_args(&argc, &argv, "-a", "-9999", NULL));
                ok1(parse_args(&argc, &argv, "-a", "9999", NULL));
                ok1(arg == 9999);
                ok1(!parse_args(&argc, &argv, "-a", "-9999", NULL));


@@ -164,7 +182,7 @@ int main(int argc, char *argv[])
        {
                int arg = 1000;
                reset_options();
        {
                int arg = 1000;
                reset_options();

-               opt_register_noarg("-a", opt_inc_intval, &arg, NULL);
+               opt_register_noarg("-a", opt_inc_intval, &arg, "");

                ok1(parse_args(&argc, &argv, "-a", NULL));
                ok1(arg == 1001);
                ok1(parse_args(&argc, &argv, "-a", "-a", NULL));
                ok1(parse_args(&argc, &argv, "-a", NULL));
                ok1(arg == 1001);
                ok1(parse_args(&argc, &argv, "-a", "-a", NULL));


@@ -178,7 +196,7 @@ int main(int argc, char *argv[])
                int exitval;
                reset_options();
                opt_register_noarg("-a",
                int exitval;
                reset_options();
                opt_register_noarg("-a",

-                                  opt_version_and_exit, "1.2.3", NULL);
+                                  opt_version_and_exit, "1.2.3", "");

                exitval = setjmp(exited);
                if (exitval == 0) {
                        parse_args(&argc, &argv, "-a", NULL);
                exitval = setjmp(exited);
                if (exitval == 0) {
                        parse_args(&argc, &argv, "-a", NULL);


@@ -196,7 +214,7 @@ int main(int argc, char *argv[])
                int exitval;
                reset_options();
                opt_register_noarg("-a",
                int exitval;
                reset_options();
                opt_register_noarg("-a",

-                                  opt_usage_and_exit, "[args]", NULL);
+                                  opt_usage_and_exit, "[args]", "");

                exitval = setjmp(exited);
                if (exitval == 0) {
                        parse_args(&argc, &argv, "-a", NULL);
                exitval = setjmp(exited);
                if (exitval == 0) {
                        parse_args(&argc, &argv, "-a", NULL);