diff options
| -rwxr-xr-x | t/t0040-parse-options.sh | 11 | ||||
| -rw-r--r-- | test-parse-options.c | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 03dbe00102..e38241c80a 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -47,6 +47,7 @@ test_expect_success 'test help' ' cat > expect << EOF boolean: 2 integer: 1729 +timestamp: 0 string: 123 abbrev: 7 verbose: 2 @@ -63,6 +64,7 @@ test_expect_success 'short options' ' cat > expect << EOF boolean: 2 integer: 1729 +timestamp: 0 string: 321 abbrev: 10 verbose: 2 @@ -88,6 +90,7 @@ test_expect_success 'missing required value' ' cat > expect << EOF boolean: 1 integer: 13 +timestamp: 0 string: 123 abbrev: 7 verbose: 0 @@ -108,6 +111,7 @@ test_expect_success 'intermingled arguments' ' cat > expect << EOF boolean: 0 integer: 2 +timestamp: 0 string: (not set) abbrev: 7 verbose: 0 @@ -135,6 +139,7 @@ test_expect_success 'ambiguously abbreviated option' ' cat > expect << EOF boolean: 0 integer: 0 +timestamp: 0 string: 123 abbrev: 7 verbose: 0 @@ -161,6 +166,7 @@ test_expect_success 'detect possible typos' ' cat > expect <<EOF boolean: 0 integer: 0 +timestamp: 0 string: (not set) abbrev: 7 verbose: 0 @@ -177,7 +183,8 @@ test_expect_success 'keep some options as arguments' ' cat > expect <<EOF boolean: 0 -integer: 1 +integer: 0 +timestamp: 1 string: default abbrev: 7 verbose: 0 @@ -197,6 +204,7 @@ cat > expect <<EOF Callback: "four", 0 boolean: 5 integer: 4 +timestamp: 0 string: (not set) abbrev: 7 verbose: 0 @@ -223,6 +231,7 @@ test_expect_success 'OPT_CALLBACK() and callback errors work' ' cat > expect <<EOF boolean: 1 integer: 23 +timestamp: 0 string: (not set) abbrev: 7 verbose: 0 diff --git a/test-parse-options.c b/test-parse-options.c index 2a79e729a4..6e18083a7d 100644 --- a/test-parse-options.c +++ b/test-parse-options.c @@ -2,7 +2,8 @@ #include "parse-options.h" static int boolean = 0; -static unsigned long integer = 0; +static int integer = 0; +static unsigned long timestamp; static int abbrev = 7; static int verbose = 0, dry_run = 0, quiet = 0; static char *string = NULL; @@ -32,7 +33,7 @@ int main(int argc, const char **argv) OPT_INTEGER('i', "integer", &integer, "get a integer"), OPT_INTEGER('j', NULL, &integer, "get a integer, too"), OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23), - OPT_DATE('t', NULL, &integer, "get timestamp of <time>"), + OPT_DATE('t', NULL, ×tamp, "get timestamp of <time>"), OPT_CALLBACK('L', "length", &integer, "str", "get length of <str>", length_callback), OPT_GROUP("String options"), @@ -56,7 +57,8 @@ int main(int argc, const char **argv) argc = parse_options(argc, argv, options, usage, 0); printf("boolean: %d\n", boolean); - printf("integer: %lu\n", integer); + printf("integer: %u\n", integer); + printf("timestamp: %lu\n", timestamp); printf("string: %s\n", string ? string : "(not set)"); printf("abbrev: %d\n", abbrev); printf("verbose: %d\n", verbose); |