test: add opt_inherit to arg-test

[notmuch] / test / arg-test.c

diff --git a/test/arg-test.c b/test/arg-test.c
index 6c49eacd7f3a9bab7537ee82059b6c66a5a76d7a..a379f23e308a8b349efc5fc4a664ae3ea4e870a7 100644 (file)
--- a/test/arg-test.c
+++ b/test/arg-test.c
@@ -7,30 +7,50 @@ int main(int argc, char **argv){
     int opt_index=1;
 
     int kw_val=0;
+    int fl_val=0;
     int int_val=0;
-    char *pos_arg1=NULL;
-    char *pos_arg2=NULL;
-    char *string_val=NULL;
+    const char *pos_arg1=NULL;
+    const char *pos_arg2=NULL;
+    const char *string_val=NULL;
+    notmuch_bool_t bool_val = FALSE;
+
+    notmuch_opt_desc_t parent_options[] = {
+       { .opt_flags = &fl_val, .name = "flag", .keywords =
+         (notmuch_keyword_t []){ { "one",   1 << 0},
+                                 { "two",   1 << 1 },
+                                 { "three", 1 << 2 },
+                                 { 0, 0 } } },
+       { .opt_int = &int_val, .name = "int" },
+       { }
+    };
 
     notmuch_opt_desc_t options[] = {
-       { NOTMUCH_OPT_KEYWORD, &kw_val, "keyword", 'k',
+       { .opt_bool = &bool_val, .name = "boolean" },
+       { .opt_keyword = &kw_val, .name = "keyword", .keywords =
          (notmuch_keyword_t []){ { "one", 1 },
                                  { "two", 2 },
                                  { 0, 0 } } },
-       { NOTMUCH_OPT_INT, &int_val, "int", 'i', 0},
-       { NOTMUCH_OPT_STRING, &string_val, "string", 's', 0},
-       { NOTMUCH_OPT_POSITION, &pos_arg1, 0,0, 0},
-       { NOTMUCH_OPT_POSITION, &pos_arg2, 0,0, 0},
-       { 0, 0, 0, 0, 0 } };
+       { .opt_inherit = parent_options },
+       { .opt_string = &string_val, .name = "string" },
+       { .opt_position = &pos_arg1 },
+       { .opt_position = &pos_arg2 },
+       { }
+    };
 
     opt_index = parse_arguments(argc, argv, options, 1);
 
     if (opt_index < 0)
        return 1;
 
+    if (bool_val)
+       printf("boolean %d\n", bool_val);
+
     if (kw_val)
        printf("keyword %d\n", kw_val);
 
+    if (fl_val)
+       printf("flags %d\n", fl_val);
+
     if (int_val)
        printf("int %d\n", int_val);