opt: Put actual options inside names.

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

diff --git a/ccan/opt/test/run.c b/ccan/opt/test/run.c
index a06e4b532aa57e4ff0cd2b9c11b83f9c1502a06b..4eb78c936a44eeb4cdcad26a634c4f4dd3c52615 100644 (file)
--- a/ccan/opt/test/run.c
+++ b/ccan/opt/test/run.c
@@ -8,7 +8,7 @@ static void reset_options(void)
 {
        free(opt_table);
        opt_table = NULL;
-       opt_count = 0;
+       opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
        free(err_output);
        err_output = NULL;
 }
@@ -20,7 +20,7 @@ int main(int argc, char *argv[])
        plan_tests(148);
 
        /* Simple short arg.*/
-       opt_register_noarg(NULL, 'a', test_noarg, NULL, NULL);
+       opt_register_noarg("-a", test_noarg, NULL, NULL);
        ok1(parse_args(&argc, &argv, "-a", NULL));
        ok1(argc == 1);
        ok1(argv[0] == myname);
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
        ok1(test_cb_called == 1);
 
        /* Simple long arg. */
-       opt_register_noarg("aaa", 0, test_noarg, NULL, NULL);
+       opt_register_noarg("--aaa", test_noarg, NULL, NULL);
        ok1(parse_args(&argc, &argv, "--aaa", NULL));
        ok1(argc == 1);
        ok1(argv[0] == myname);
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
        ok1(test_cb_called == 2);
 
        /* Both long and short args. */
-       opt_register_noarg("aaa", 'a', test_noarg, NULL, NULL);
+       opt_register_noarg("--aaa/-a", test_noarg, NULL, NULL);
        ok1(parse_args(&argc, &argv, "--aaa", "-a", NULL));
        ok1(argc == 1);
        ok1(argv[0] == myname);
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
        /* Argument variants. */
        reset_options();
        test_cb_called = 0;
-       opt_register_arg("aaa", 'a', test_arg, "aaa", NULL);
+       opt_register_arg("-a/--aaa", test_arg, NULL, "aaa", NULL);
        ok1(parse_args(&argc, &argv, "--aaa", "aaa", NULL));
        ok1(argc == 1);
        ok1(argv[0] == myname);
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
        reset_options();
 
        /* glibc's getopt does not handle ? with arguments. */
-       opt_register_noarg(NULL, '?', test_noarg, NULL, NULL);
+       opt_register_noarg("-?", test_noarg, NULL, NULL);
        ok1(parse_args(&argc, &argv, "-?", NULL));
        ok1(test_cb_called == 1);
        ok1(parse_args(&argc, &argv, "-a", NULL) == false);