X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Fopt%2Ftest%2Frun.c;h=1e04ec169ac2b3dea21ba83909e312accc50a565;hb=7e381e6c241957ff5840b1d8a0ab5f3bde6337c2;hp=4eb78c936a44eeb4cdcad26a634c4f4dd3c52615;hpb=d89e5744f30b584ac4909ce1164af1289c41359b;p=ccan-lca-2011.git

diff --git a/ccan/opt/test/run.c b/ccan/opt/test/run.c
index 4eb78c9..1e04ec1 100644
--- a/ccan/opt/test/run.c
+++ b/ccan/opt/test/run.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
+#include <ccan/opt/helpers.c>
 #include "utils.h"
 
 static void reset_options(void)
@@ -20,7 +21,7 @@ int main(int argc, char *argv[])
 	plan_tests(148);
 
 	/* Simple short arg.*/
-	opt_register_noarg("-a", test_noarg, NULL, NULL);
+	opt_register_noarg("-a", test_noarg, NULL, "All");
 	ok1(parse_args(&argc, &argv, "-a", NULL));
 	ok1(argc == 1);
 	ok1(argv[0] == myname);
@@ -28,7 +29,7 @@ int main(int argc, char *argv[])
 	ok1(test_cb_called == 1);
 
 	/* Simple long arg. */
-	opt_register_noarg("--aaa", test_noarg, NULL, NULL);
+	opt_register_noarg("--aaa", test_noarg, NULL, "AAAAll");
 	ok1(parse_args(&argc, &argv, "--aaa", NULL));
 	ok1(argc == 1);
 	ok1(argv[0] == myname);
@@ -36,7 +37,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, "AAAAAAll");
 	ok1(parse_args(&argc, &argv, "--aaa", "-a", NULL));
 	ok1(argc == 1);
 	ok1(argv[0] == myname);
@@ -54,7 +55,7 @@ int main(int argc, char *argv[])
 	/* Argument variants. */
 	reset_options();
 	test_cb_called = 0;
-	opt_register_arg("-a/--aaa", test_arg, NULL, "aaa", NULL);
+	opt_register_arg("-a|--aaa", test_arg, NULL, "aaa", "AAAAAAll");
 	ok1(parse_args(&argc, &argv, "--aaa", "aaa", NULL));
 	ok1(argc == 1);
 	ok1(argv[0] == myname);
@@ -201,7 +202,7 @@ int main(int argc, char *argv[])
 	reset_options();
 
 	/* glibc's getopt does not handle ? with arguments. */
-	opt_register_noarg("-?", test_noarg, NULL, NULL);
+	opt_register_noarg("-?", test_noarg, NULL, "Help");
 	ok1(parse_args(&argc, &argv, "-?", NULL));
 	ok1(test_cb_called == 1);
 	ok1(parse_args(&argc, &argv, "-a", NULL) == false);