X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fopt%2Ftest%2Frun-helpers.c;h=49fb2062e30427725c4b79b33303df55edc02e14;hp=e0fbd32e6bcf6f6a28c17e9818a169ff22997747;hb=b989e06c093fb7a2befae277f684fa75b64b9ef5;hpb=abde990702b6d6c3739edf85578af8529608ade5 diff --git a/ccan/opt/test/run-helpers.c b/ccan/opt/test/run-helpers.c index e0fbd32e..49fb2062 100644 --- a/ccan/opt/test/run-helpers.c +++ b/ccan/opt/test/run-helpers.c @@ -19,21 +19,11 @@ static int saved_fprintf(FILE *ignored, const char *fmt, ...); #define vfprintf(f, fmt, ap) saved_vprintf(fmt, ap) static int saved_vprintf(const char *fmt, va_list ap); -#define malloc(size) saved_malloc(size) -static void *saved_malloc(size_t size); - #include #include #include #include -static void reset_options(void) -{ - free(opt_table); - opt_table = NULL; - opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0; -} - static char *output = NULL; static int saved_vprintf(const char *fmt, va_list ap) @@ -72,17 +62,22 @@ static int saved_fprintf(FILE *ignored, const char *fmt, ...) return ret; } -#undef malloc -static void *last_allocation; -static void *saved_malloc(size_t size) +static void set_args(int *argc, char ***argv, ...) { - return last_allocation = malloc(size); + va_list ap; + *argv = malloc(sizeof(**argv) * 20); + + va_start(ap, argv); + for (*argc = 0; + ((*argv)[*argc] = va_arg(ap, char*)) != NULL; + (*argc)++); + va_end(ap); } /* Test helpers. */ int main(int argc, char *argv[]) { - plan_tests(452); + plan_tests(476); /* opt_set_bool */ { @@ -127,7 +122,7 @@ int main(int argc, char *argv[]) } /* opt_set_charp */ { - char *arg = (char *)"wrong"; + char *arg = cast_const(char *, "wrong"); reset_options(); opt_register_arg("-a", opt_set_charp, NULL, &arg, "All"); ok1(parse_args(&argc, &argv, "-a", "string", NULL)); @@ -211,6 +206,32 @@ int main(int argc, char *argv[]) else fail("FIXME: Handle other long sizes"); } + /* opt_set_floatval */ + { + float arg = 1000; + reset_options(); + opt_register_arg("-a", opt_set_floatval, NULL, &arg, "All"); + ok1(parse_args(&argc, &argv, "-a", "9999", NULL)); + ok1(arg == 9999); + ok1(parse_args(&argc, &argv, "-a", "-9999", NULL)); + ok1(arg == -9999); + ok1(parse_args(&argc, &argv, "-a", "0", NULL)); + ok1(arg == 0); + ok1(!parse_args(&argc, &argv, "-a", "100crap", NULL)); + } + /* opt_set_doubleval */ + { + double arg = 1000; + reset_options(); + opt_register_arg("-a", opt_set_doubleval, NULL, &arg, "All"); + ok1(parse_args(&argc, &argv, "-a", "9999", NULL)); + ok1(arg == 9999); + ok1(parse_args(&argc, &argv, "-a", "-9999", NULL)); + ok1(arg == -9999); + ok1(parse_args(&argc, &argv, "-a", "0", NULL)); + ok1(arg == 0); + ok1(!parse_args(&argc, &argv, "-a", "100crap", NULL)); + } { const long long k = 1024; @@ -992,11 +1013,7 @@ int main(int argc, char *argv[]) /* parse_args allocates argv */ free(argv); - argc = 2; - argv = malloc(sizeof(argv[0]) * 3); - argv[0] = (char *)"thisprog"; - argv[1] = (char *)"-a"; - argv[2] = NULL; + set_args(&argc, &argv, "thisprog", "-a", NULL); exitval = setjmp(exited); if (exitval == 0) { @@ -1004,6 +1021,8 @@ int main(int argc, char *argv[]) fail("opt_show_version_and_exit returned?"); } else { ok1(exitval - 1 == 0); + /* We should have freed table!. */ + ok1(opt_table == NULL); } ok1(strcmp(output, "1.2.3\n") == 0); free(output); @@ -1018,11 +1037,7 @@ int main(int argc, char *argv[]) opt_register_noarg("-a", opt_usage_and_exit, "[args]", ""); - argc = 2; - argv = malloc(sizeof(argv[0]) * 3); - argv[0] = (char *)"thisprog"; - argv[1] = (char *)"-a"; - argv[2] = NULL; + set_args(&argc, &argv, "thisprog", "-a", NULL); exitval = setjmp(exited); if (exitval == 0) { @@ -1030,14 +1045,14 @@ int main(int argc, char *argv[]) fail("opt_usage_and_exit returned?"); } else { ok1(exitval - 1 == 0); + /* We should have freed table!. */ + ok1(opt_table == NULL); } ok1(strstr(output, "[args]")); ok1(strstr(output, argv[0])); - ok1(strstr(output, "[-a]")); + ok1(strstr(output, "\n-a")); free(output); free(argv); - /* It exits without freeing usage string. */ - free(last_allocation); output = NULL; } @@ -1151,17 +1166,47 @@ int main(int argc, char *argv[]) ok1(buf[OPT_SHOW_LEN] == '!'); } + /* opt_show_floatval */ + { + float f; + char buf[OPT_SHOW_LEN+2] = { 0 }; + buf[OPT_SHOW_LEN] = '!'; + + f = -77.5; + opt_show_floatval(buf, &f); + ok1(strcmp(buf, "-77.500000") == 0); + ok1(buf[OPT_SHOW_LEN] == '!'); + + f = 77.5; + opt_show_floatval(buf, &f); + ok1(strcmp(buf, "77.500000") == 0); + ok1(buf[OPT_SHOW_LEN] == '!'); + } + + /* opt_show_doubleval */ + { + double d; + char buf[OPT_SHOW_LEN+2] = { 0 }; + buf[OPT_SHOW_LEN] = '!'; + + d = -77; + opt_show_doubleval(buf, &d); + ok1(strcmp(buf, "-77.000000") == 0); + ok1(buf[OPT_SHOW_LEN] == '!'); + + d = 77; + opt_show_doubleval(buf, &d); + ok1(strcmp(buf, "77.000000") == 0); + ok1(buf[OPT_SHOW_LEN] == '!'); + } + /* opt_log_stderr. */ { reset_options(); opt_register_noarg("-a", opt_usage_and_exit, "[args]", ""); - argc = 2; - argv = malloc(sizeof(argv[0]) * 3); - argv[0] = (char *)"thisprog"; - argv[1] = (char *)"--garbage"; - argv[2] = NULL; + set_args(&argc, &argv, "thisprog", "--garbage", NULL); ok1(!opt_parse(&argc, argv, opt_log_stderr)); ok1(!strcmp(output, "thisprog: --garbage: unrecognized option\n")); @@ -1176,11 +1221,7 @@ int main(int argc, char *argv[]) reset_options(); opt_register_noarg("-a", opt_usage_and_exit, "[args]", ""); - argc = 2; - argv = malloc(sizeof(argv[0]) * 3); - argv[0] = (char *)"thisprog"; - argv[1] = (char *)"--garbage"; - argv[2] = NULL; + set_args(&argc, &argv, "thisprog", "--garbage", NULL); exitval = setjmp(exited); if (exitval == 0) { opt_parse(&argc, argv, opt_log_stderr_exit);