X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=tests%2Fcmd%2Fcommand-t.c;h=b4718f37e168501b2af03b43ea2fc80903820583;hp=3322e1b1f61e537767150ce0c92ac62c358118a0;hb=c8e52c1f457a237ec83be0fbe535077d5bccdd51;hpb=a9595ab04712b523db8b0ca934613aa1a60cda99

diff --git a/tests/cmd/command-t.c b/tests/cmd/command-t.c
index 3322e1b..b4718f3 100644
--- a/tests/cmd/command-t.c
+++ b/tests/cmd/command-t.c
@@ -33,7 +33,7 @@
 
 #include <afs/cmd.h>
 
-#include <tap/basic.h>
+#include <tests/tap/basic.h>
 
 enum cmdOptions {
    copt_flag = 0,
@@ -59,18 +59,43 @@ testproc(struct cmd_syndesc *as, void *rock)
     return 0;
 }
 
+static void
+checkList(struct cmd_item *list, ...)
+{
+    va_list ap;
+    char *el;
+
+    va_start(ap, list);
+    el = va_arg(ap, char *);
+    while (el != NULL && list != NULL) {
+       is_string(el, list->data, "list element matches");
+       list = list->next;
+       el = va_arg(ap, char *);
+    }
+
+    if (el == NULL && list == NULL) {
+	ok(1, "List has correct number of elements");
+    } else if (el == NULL) {
+	ok(0, "List has too many elements");
+    } else if (list == NULL) {
+	ok(0, "List has too few elements");
+    }
+}
+
 int
 main(int argc, char **argv)
 {
     char *tv[100];
     struct cmd_syndesc *opts;
     struct cmd_syndesc *retopts;
+    struct cmd_item *list;
     int code;
     int tc;
     int retval;
+    char *path;
     char *retstring = NULL;
 
-    plan(85);
+    plan(109);
 
     initialize_CMD_error_table();
 
@@ -202,7 +227,8 @@ main(int argc, char **argv)
 	      " ... 1st option matches");
     is_string("two", retopts->parms[copt_second].items->data,
 	      " ... 2nd option matches");
-    ok(retopts->parms[copt_flag].items != NULL, " ... 3rd option matches");
+    ok(retopts->parms[copt_flag].items != NULL,
+	      " ... 3rd option matches");
 
     cmd_FreeOptions(&retopts);
     cmd_FreeArgv(tv);
@@ -230,16 +256,25 @@ main(int argc, char **argv)
     code = cmd_OptionAsInt(retopts, copt_first, &retval);
     is_int(0, code, "cmd_OptionsAsInt succeeds");
     is_int(1, retval, " ... and returns correct value");
+    ok(cmd_OptionPresent(retopts, copt_first),
+       " ... and is marked as present");
 
     code = cmd_OptionAsString(retopts, copt_second, &retstring);
     is_int(0, code, "cmd_OptionsAsString succeeds");
     is_string("second", retstring, " ... and returns correct value");
     free(retstring);
     retstring = NULL;
+    ok(cmd_OptionPresent(retopts, copt_second),
+       " ... and is marked as present");
 
     code = cmd_OptionAsFlag(retopts, copt_flag, &retval);
     is_int(0, code, "cmd_OptionsAsFlag succeeds");
     ok(retval, " ... and flag is correct");
+    ok(cmd_OptionPresent(retopts, copt_flag),
+       " ... and is marked as present");
+
+    ok(!cmd_OptionPresent(retopts, copt_sugar),
+       "Missing option is marked as such");
 
     cmd_FreeOptions(&retopts);
     cmd_FreeArgv(tv);
@@ -313,6 +348,44 @@ main(int argc, char **argv)
     cmd_FreeOptions(&retopts);
     cmd_FreeArgv(tv);
 
+    /* Check list behaviour */
+    code = cmd_ParseLine("-first 1 -second one two three", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "cmd_Parse succeeds for a list");
+    code = cmd_OptionAsList(retopts, copt_second, &list);
+    is_int(0, code, "cmd_OptionAsList succeeds");
+    checkList(list, "one", "two", "three", NULL);
+    cmd_FreeOptions(&retopts);
+    cmd_FreeArgv(tv);
+
+    /* Now, try adding a configuration file into the mix */
+    if (getenv("SOURCE") == NULL)
+	path = strdup("test1.conf");
+    else
+	asprintf(&path, "%s/cmd/test1.conf", getenv("SOURCE"));
+
+    cmd_SetCommandName("test");
+    code = cmd_OpenConfigFile(path);
+    is_int(0, code, "cmd_OpenConfigFile succeeds");
+
+    code = cmd_ParseLine("-first 1", tv, &tc, 100);
+    is_int(0, code, "cmd_ParseLine succeeds");
+    code = cmd_Parse(tc, tv, &retopts);
+    is_int(0, code, "cmd_Parse succeeds when we have a config file");
+    code = cmd_OptionAsInt(retopts, copt_perhaps, &retval);
+    is_int(0, code, "cmd_OptionsAsInt succeeds");
+    is_int(10, retval, " ... and we have the correct value for perhaps");
+    code = cmd_OptionAsString(retopts, copt_sanity, &retstring);
+    is_int(0, code, "cmd_OptionAsString succeeds");
+    is_string("testing", retstring,
+	      " ... and we have the correct value for sanity");
+
+    /* Check breaking up a list of options */
+    code = cmd_OptionAsList(retopts, copt_second, &list);
+    is_int(0, code, "cmd_OptionAsList succeeds");
+    checkList(list, "one", "two", "three", "four", NULL);
+
     return 0;
 }