2007-10-13 18:34:45 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Johannes Schindelin
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='our own option parser'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2018-09-09 19:36:29 +02:00
|
|
|
usage: test-tool parse-options <options>
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2017-09-25 06:08:03 +02:00
|
|
|
A helper function for the parse-options API.
|
|
|
|
|
2012-02-25 20:11:16 +01:00
|
|
|
--yes get a boolean
|
|
|
|
-D, --no-doubt begins with 'no-'
|
|
|
|
-B, --no-fear be brave
|
|
|
|
-b, --boolean increment by one
|
2008-06-22 17:04:26 +02:00
|
|
|
-4, --or4 bitwise-or boolean with ...0100
|
2009-05-07 21:44:17 +02:00
|
|
|
--neg-or4 same as --no-or4
|
2008-06-22 17:04:26 +02:00
|
|
|
|
2007-10-13 18:34:45 +02:00
|
|
|
-i, --integer <n> get a integer
|
|
|
|
-j <n> get a integer, too
|
2015-06-21 20:25:44 +02:00
|
|
|
-m, --magnitude <n> get a magnitude
|
2008-06-22 17:04:26 +02:00
|
|
|
--set23 set integer to 23
|
2020-02-20 15:15:15 +01:00
|
|
|
--mode1 set integer to 1 (cmdmode option)
|
|
|
|
--mode2 set integer to 2 (cmdmode option)
|
2008-06-22 17:04:26 +02:00
|
|
|
-L, --length <str> get length of <str>
|
2011-02-15 14:09:13 +01:00
|
|
|
-F, --file <file> set file to <file>
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2008-06-22 17:04:26 +02:00
|
|
|
String options
|
2007-10-13 18:34:45 +02:00
|
|
|
-s, --string <string>
|
|
|
|
get a string
|
|
|
|
--string2 <str> get another string
|
2007-11-05 14:15:21 +01:00
|
|
|
--st <st> get another string (pervert ordering)
|
2008-01-26 12:26:57 +01:00
|
|
|
-o <str> get another string
|
2011-06-09 17:55:23 +02:00
|
|
|
--list <str> add str to list
|
2007-10-13 18:34:45 +02:00
|
|
|
|
2008-06-22 17:04:26 +02:00
|
|
|
Magic arguments
|
2008-03-02 11:35:56 +01:00
|
|
|
--quux means --quux
|
2009-05-07 21:45:08 +02:00
|
|
|
-NUM set integer to NUM
|
2009-05-07 21:45:42 +02:00
|
|
|
+ same as -b
|
2009-09-25 20:44:44 +02:00
|
|
|
--ambiguous positive ambiguity
|
|
|
|
--no-ambiguous negative ambiguity
|
2008-03-02 11:35:56 +01:00
|
|
|
|
2008-06-22 17:04:26 +02:00
|
|
|
Standard options
|
|
|
|
--abbrev[=<n>] use <n> digits to display SHA-1s
|
|
|
|
-v, --verbose be verbose
|
|
|
|
-n, --dry-run dry run
|
|
|
|
-q, --quiet be quiet
|
2016-05-05 23:36:55 +02:00
|
|
|
--expect <string> expected output in the variable dump
|
2008-06-22 17:04:26 +02:00
|
|
|
|
2019-04-29 12:05:25 +02:00
|
|
|
Alias
|
|
|
|
-A, --alias-source <string>
|
|
|
|
get a string
|
|
|
|
-Z, --alias-target <string>
|
|
|
|
get a string
|
|
|
|
|
2007-10-13 18:34:45 +02:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'test help' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test_must_fail test-tool parse-options -h >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2012-08-27 07:36:55 +02:00
|
|
|
test_i18ncmp expect output
|
2007-10-13 18:34:45 +02:00
|
|
|
'
|
|
|
|
|
2010-05-17 17:34:41 +02:00
|
|
|
mv expect expect.err
|
|
|
|
|
2016-05-06 20:17:05 +02:00
|
|
|
check () {
|
2012-02-25 20:11:16 +01:00
|
|
|
what="$1" &&
|
|
|
|
shift &&
|
|
|
|
expect="$1" &&
|
|
|
|
shift &&
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="$what $expect" "$@"
|
2012-02-25 20:11:16 +01:00
|
|
|
}
|
|
|
|
|
2012-08-27 07:36:55 +02:00
|
|
|
check_unknown_i18n() {
|
|
|
|
case "$1" in
|
|
|
|
--*)
|
|
|
|
echo error: unknown option \`${1#--}\' >expect ;;
|
|
|
|
-*)
|
|
|
|
echo error: unknown switch \`${1#-}\' >expect ;;
|
|
|
|
esac &&
|
|
|
|
cat expect.err >>expect &&
|
2018-09-09 19:36:29 +02:00
|
|
|
test_must_fail test-tool parse-options $* >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output &&
|
2012-08-27 07:36:55 +02:00
|
|
|
test_i18ncmp expect output.err
|
|
|
|
}
|
|
|
|
|
2012-02-25 20:11:16 +01:00
|
|
|
test_expect_success 'OPT_BOOL() #1' 'check boolean: 1 --yes'
|
|
|
|
test_expect_success 'OPT_BOOL() #2' 'check boolean: 1 --no-doubt'
|
|
|
|
test_expect_success 'OPT_BOOL() #3' 'check boolean: 1 -D'
|
|
|
|
test_expect_success 'OPT_BOOL() #4' 'check boolean: 1 --no-fear'
|
|
|
|
test_expect_success 'OPT_BOOL() #5' 'check boolean: 1 -B'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_BOOL() is idempotent #1' 'check boolean: 1 --yes --yes'
|
|
|
|
test_expect_success 'OPT_BOOL() is idempotent #2' 'check boolean: 1 -DB'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_BOOL() negation #1' 'check boolean: 0 -D --no-yes'
|
|
|
|
test_expect_success 'OPT_BOOL() negation #2' 'check boolean: 0 -D --no-no-doubt'
|
|
|
|
|
2017-09-25 06:08:04 +02:00
|
|
|
test_expect_success 'OPT_BOOL() no negation #1' 'check_unknown_i18n --fear'
|
|
|
|
test_expect_success 'OPT_BOOL() no negation #2' 'check_unknown_i18n --no-no-fear'
|
2012-02-25 20:11:16 +01:00
|
|
|
|
2012-02-25 20:14:54 +01:00
|
|
|
test_expect_success 'OPT_BOOL() positivation' 'check boolean: 0 -D --doubt'
|
2012-02-25 20:11:16 +01:00
|
|
|
|
2015-06-21 20:25:43 +02:00
|
|
|
test_expect_success 'OPT_INT() negative' 'check integer: -2345 -i -2345'
|
|
|
|
|
2015-06-21 20:25:44 +02:00
|
|
|
test_expect_success 'OPT_MAGNITUDE() simple' '
|
|
|
|
check magnitude: 2345678 -m 2345678
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_MAGNITUDE() kilo' '
|
|
|
|
check magnitude: 239616 -m 234k
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_MAGNITUDE() mega' '
|
|
|
|
check magnitude: 104857600 -m 100m
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_MAGNITUDE() giga' '
|
|
|
|
check magnitude: 1073741824 -m 1g
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_MAGNITUDE() 3giga' '
|
|
|
|
check magnitude: 3221225472 -m 3g
|
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2007-10-13 18:34:45 +02:00
|
|
|
boolean: 2
|
|
|
|
integer: 1729
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 16384
|
2008-07-30 21:53:45 +02:00
|
|
|
timestamp: 0
|
2007-10-13 18:34:45 +02:00
|
|
|
string: 123
|
2008-06-22 17:04:26 +02:00
|
|
|
abbrev: 7
|
|
|
|
verbose: 2
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
dry run: yes
|
2009-05-23 20:53:13 +02:00
|
|
|
file: prefix/my.file
|
2007-10-13 18:34:45 +02:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'short options' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
|
2015-06-21 20:25:44 +02:00
|
|
|
>output 2>output.err &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp expect output &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err
|
2007-10-13 18:34:45 +02:00
|
|
|
'
|
2008-06-22 17:04:26 +02:00
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2007-10-13 18:34:45 +02:00
|
|
|
boolean: 2
|
|
|
|
integer: 1729
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 16384
|
2008-07-30 21:53:45 +02:00
|
|
|
timestamp: 0
|
2007-10-13 18:34:45 +02:00
|
|
|
string: 321
|
2008-06-22 17:04:26 +02:00
|
|
|
abbrev: 10
|
|
|
|
verbose: 2
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
dry run: no
|
2009-05-23 20:53:13 +02:00
|
|
|
file: prefix/fi.le
|
2007-10-13 18:34:45 +02:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'long options' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --boolean --integer 1729 --magnitude 16k \
|
2015-06-21 20:25:44 +02:00
|
|
|
--boolean --string2=321 --verbose --verbose --no-dry-run \
|
|
|
|
--abbrev=10 --file fi.le --obsolete \
|
|
|
|
>output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp expect output
|
2007-10-13 18:34:45 +02:00
|
|
|
'
|
|
|
|
|
2008-07-21 20:30:36 +02:00
|
|
|
test_expect_success 'missing required value' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test_expect_code 129 test-tool parse-options -s &&
|
|
|
|
test_expect_code 129 test-tool parse-options --string &&
|
|
|
|
test_expect_code 129 test-tool parse-options --file
|
2008-07-21 20:30:36 +02:00
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2007-10-13 18:34:45 +02:00
|
|
|
boolean: 1
|
|
|
|
integer: 13
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 0
|
2008-07-30 21:53:45 +02:00
|
|
|
timestamp: 0
|
2007-10-13 18:34:45 +02:00
|
|
|
string: 123
|
2008-06-22 17:04:26 +02:00
|
|
|
abbrev: 7
|
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 11:50:00 +02:00
|
|
|
verbose: -1
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
dry run: no
|
2009-05-23 20:53:13 +02:00
|
|
|
file: (not set)
|
2007-10-13 18:34:45 +02:00
|
|
|
arg 00: a1
|
|
|
|
arg 01: b1
|
|
|
|
arg 02: --boolean
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'intermingled arguments' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
|
2016-04-13 01:02:17 +02:00
|
|
|
>output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp expect output
|
2007-10-13 18:34:45 +02:00
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2007-10-14 18:54:06 +02:00
|
|
|
boolean: 0
|
|
|
|
integer: 2
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 0
|
2008-07-30 21:53:45 +02:00
|
|
|
timestamp: 0
|
2007-10-14 18:54:06 +02:00
|
|
|
string: (not set)
|
2008-06-22 17:04:26 +02:00
|
|
|
abbrev: 7
|
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 11:50:00 +02:00
|
|
|
verbose: -1
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
dry run: no
|
2009-05-23 20:53:13 +02:00
|
|
|
file: (not set)
|
2007-10-14 18:54:06 +02:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'unambiguously abbreviated option' '
|
tests: disallow the use of abbreviated options (by default)
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However, it is not a good idea to rely on that in Git's test suite, as
something that is a unique abbreviation of a command line option today
might no longer be a unique abbreviation tomorrow.
For example, if a future contribution added a new mode
`git init --babyproofing` and a previously-introduced test case used the
fact that `git init --ba` expanded to `git init --bare`, that future
contribution would now have to touch seemingly unrelated tests just to
keep the test suite from failing.
So let's disallow abbreviated options in the test suite by default.
Note: for ease of implementation, this patch really only touches the
`parse-options` machinery: more and more hand-rolled option parsers are
converted to use that internal API, and more and more scripts are
converted to built-ins (naturally using the parse-options API, too), so
in practice this catches most issues, and is definitely the biggest bang
for the buck.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-12 11:37:24 +02:00
|
|
|
GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2008-05-24 07:28:56 +02:00
|
|
|
test_cmp expect output
|
2007-10-14 18:54:06 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'unambiguously abbreviated option with "="' '
|
tests: disallow the use of abbreviated options (by default)
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However, it is not a good idea to rely on that in Git's test suite, as
something that is a unique abbreviation of a command line option today
might no longer be a unique abbreviation tomorrow.
For example, if a future contribution added a new mode
`git init --babyproofing` and a previously-introduced test case used the
fact that `git init --ba` expanded to `git init --bare`, that future
contribution would now have to touch seemingly unrelated tests just to
keep the test suite from failing.
So let's disallow abbreviated options in the test suite by default.
Note: for ease of implementation, this patch really only touches the
`parse-options` machinery: more and more hand-rolled option parsers are
converted to use that internal API, and more and more scripts are
converted to built-ins (naturally using the parse-options API, too), so
in practice this catches most issues, and is definitely the biggest bang
for the buck.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-12 11:37:24 +02:00
|
|
|
GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="integer: 2" --int=2
|
2007-10-14 18:54:06 +02:00
|
|
|
'
|
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success 'ambiguously abbreviated option' '
|
tests: disallow the use of abbreviated options (by default)
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However, it is not a good idea to rely on that in Git's test suite, as
something that is a unique abbreviation of a command line option today
might no longer be a unique abbreviation tomorrow.
For example, if a future contribution added a new mode
`git init --babyproofing` and a previously-introduced test case used the
fact that `git init --ba` expanded to `git init --bare`, that future
contribution would now have to touch seemingly unrelated tests just to
keep the test suite from failing.
So let's disallow abbreviated options in the test suite by default.
Note: for ease of implementation, this patch really only touches the
`parse-options` machinery: more and more hand-rolled option parsers are
converted to use that internal API, and more and more scripts are
converted to built-ins (naturally using the parse-options API, too), so
in practice this catches most issues, and is definitely the biggest bang
for the buck.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-12 11:37:24 +02:00
|
|
|
test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
|
|
|
test-tool parse-options --strin 123
|
2007-10-14 18:54:06 +02:00
|
|
|
'
|
|
|
|
|
2007-11-05 14:15:21 +01:00
|
|
|
test_expect_success 'non ambiguous option (after two options it abbreviates)' '
|
tests: disallow the use of abbreviated options (by default)
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However, it is not a good idea to rely on that in Git's test suite, as
something that is a unique abbreviation of a command line option today
might no longer be a unique abbreviation tomorrow.
For example, if a future contribution added a new mode
`git init --babyproofing` and a previously-introduced test case used the
fact that `git init --ba` expanded to `git init --bare`, that future
contribution would now have to touch seemingly unrelated tests just to
keep the test suite from failing.
So let's disallow abbreviated options in the test suite by default.
Note: for ease of implementation, this patch really only touches the
`parse-options` machinery: more and more hand-rolled option parsers are
converted to use that internal API, and more and more scripts are
converted to built-ins (naturally using the parse-options API, too), so
in practice this catches most issues, and is definitely the biggest bang
for the buck.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-12 11:37:24 +02:00
|
|
|
GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="string: 123" --st 123
|
2007-11-05 14:15:21 +01:00
|
|
|
'
|
|
|
|
|
2019-04-29 12:05:25 +02:00
|
|
|
test_expect_success 'Alias options do not contribute to abbreviation' '
|
|
|
|
test-tool parse-options --alias-source 123 >output &&
|
|
|
|
grep "^string: 123" output &&
|
|
|
|
test-tool parse-options --alias-target 123 >output &&
|
|
|
|
grep "^string: 123" output &&
|
|
|
|
test_must_fail test-tool parse-options --alias &&
|
|
|
|
GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
|
|
|
test-tool parse-options --alias 123 >output &&
|
|
|
|
grep "^string: 123" output
|
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >typo.err <<\EOF
|
2020-02-05 14:07:23 +01:00
|
|
|
error: did you mean `--boolean` (with two dashes)?
|
2008-01-26 12:26:57 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'detect possible typos' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test_must_fail test-tool parse-options -boolean >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output &&
|
2018-11-10 06:16:13 +01:00
|
|
|
test_i18ncmp typo.err output.err
|
2008-01-26 12:26:57 +01:00
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >typo.err <<\EOF
|
2020-02-05 14:07:23 +01:00
|
|
|
error: did you mean `--ambiguous` (with two dashes)?
|
2012-03-03 12:00:29 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'detect possible typos' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output &&
|
2018-11-10 06:16:13 +01:00
|
|
|
test_i18ncmp typo.err output.err
|
2012-03-03 12:00:29 +01:00
|
|
|
'
|
|
|
|
|
2008-03-02 11:35:56 +01:00
|
|
|
test_expect_success 'keep some options as arguments' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="arg 00: --quux" --quux
|
2008-03-02 11:35:56 +01:00
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2008-06-22 17:04:26 +02:00
|
|
|
Callback: "four", 0
|
|
|
|
boolean: 5
|
|
|
|
integer: 4
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 0
|
2008-07-30 21:53:45 +02:00
|
|
|
timestamp: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
string: (not set)
|
|
|
|
abbrev: 7
|
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 11:50:00 +02:00
|
|
|
verbose: -1
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
dry run: no
|
2009-05-23 20:53:13 +02:00
|
|
|
file: (not set)
|
2008-06-22 17:04:26 +02:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --length=four -b -4 >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2008-06-22 17:04:26 +02:00
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
2017-09-25 06:08:04 +02:00
|
|
|
test_expect_success 'OPT_CALLBACK() and callback errors work' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test_must_fail test-tool parse-options --no-length >output 2>output.err &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty output &&
|
2018-03-22 19:43:51 +01:00
|
|
|
test_must_be_empty output.err
|
2008-06-22 17:04:26 +02:00
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2008-06-22 17:04:26 +02:00
|
|
|
boolean: 1
|
|
|
|
integer: 23
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 0
|
2008-07-30 21:53:45 +02:00
|
|
|
timestamp: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
string: (not set)
|
|
|
|
abbrev: 7
|
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 11:50:00 +02:00
|
|
|
verbose: -1
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2008-06-22 17:04:26 +02:00
|
|
|
dry run: no
|
2009-05-23 20:53:13 +02:00
|
|
|
file: (not set)
|
2008-06-22 17:04:26 +02:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'OPT_BIT() and OPT_SET_INT() work' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2008-06-22 17:04:26 +02:00
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
2009-05-07 21:44:17 +02:00
|
|
|
test_expect_success 'OPT_NEGBIT() and OPT_SET_INT() work' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2009-05-07 21:44:17 +02:00
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_BIT() works' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="boolean: 6" -bb --or4
|
2009-05-07 21:44:17 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_NEGBIT() works' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
|
2009-05-07 21:44:17 +02:00
|
|
|
'
|
2008-06-22 17:04:26 +02:00
|
|
|
|
2020-02-20 15:15:15 +01:00
|
|
|
test_expect_success 'OPT_CMDMODE() works' '
|
|
|
|
test-tool parse-options --expect="integer: 1" --mode1
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_CMDMODE() detects incompatibility' '
|
|
|
|
test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
|
|
|
|
test_must_be_empty output &&
|
|
|
|
test_i18ngrep "incompatible with --mode" output.err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' '
|
|
|
|
test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
|
|
|
|
test_must_be_empty output &&
|
|
|
|
test_i18ngrep "incompatible with something else" output.err
|
|
|
|
'
|
|
|
|
|
2012-02-25 20:11:16 +01:00
|
|
|
test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="boolean: 6" + + + + + +
|
2009-05-07 21:45:42 +02:00
|
|
|
'
|
|
|
|
|
2009-05-07 21:45:08 +02:00
|
|
|
test_expect_success 'OPT_NUMBER_CALLBACK() works' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="integer: 12345" -12345
|
2009-05-07 21:45:08 +02:00
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >expect <<\EOF
|
2009-09-25 20:44:44 +02:00
|
|
|
boolean: 0
|
|
|
|
integer: 0
|
2015-06-21 20:25:44 +02:00
|
|
|
magnitude: 0
|
2009-09-25 20:44:44 +02:00
|
|
|
timestamp: 0
|
|
|
|
string: (not set)
|
|
|
|
abbrev: 7
|
parse-options.c: make OPTION_COUNTUP respect "unspecified" values
OPT_COUNTUP() merely increments the counter upon --option, and resets it
to 0 upon --no-option, which means that there is no "unspecified" value
with which a client can initialize the counter to determine whether or
not --[no]-option was seen at all.
Make OPT_COUNTUP() treat any negative number as an "unspecified" value
to address this shortcoming. In particular, if a client initializes the
counter to -1, then if it is still -1 after parse_options(), then
neither --option nor --no-option was seen; if it is 0, then --no-option
was seen last, and if it is 1 or greater, than --option was seen last.
This change does not affect the behavior of existing clients because
they all use the initial value of 0 (or more).
Note that builtin/clean.c initializes the variable used with
OPT__FORCE (which uses OPT_COUNTUP()) to a negative value, but it is set
to either 0 or 1 by reading the configuration before the code calls
parse_options(), i.e. as far as parse_options() is concerned, the
initial value of the variable is not negative.
To test this behavior, in test-parse-options.c, "verbose" is set to
"unspecified" while quiet is set to 0 which will test the new behavior
with all sets of values.
Helped-by: Jeff King <peff@peff.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 11:50:00 +02:00
|
|
|
verbose: -1
|
2016-04-13 01:02:17 +02:00
|
|
|
quiet: 0
|
2009-09-25 20:44:44 +02:00
|
|
|
dry run: no
|
|
|
|
file: (not set)
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'negation of OPT_NONEG flags is not ambiguous' '
|
tests: disallow the use of abbreviated options (by default)
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However, it is not a good idea to rely on that in Git's test suite, as
something that is a unique abbreviation of a command line option today
might no longer be a unique abbreviation tomorrow.
For example, if a future contribution added a new mode
`git init --babyproofing` and a previously-introduced test case used the
fact that `git init --ba` expanded to `git init --bare`, that future
contribution would now have to touch seemingly unrelated tests just to
keep the test suite from failing.
So let's disallow abbreviated options in the test suite by default.
Note: for ease of implementation, this patch really only touches the
`parse-options` machinery: more and more hand-rolled option parsers are
converted to use that internal API, and more and more scripts are
converted to built-ins (naturally using the parse-options API, too), so
in practice this catches most issues, and is definitely the biggest bang
for the buck.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-12 11:37:24 +02:00
|
|
|
GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --no-ambig >output 2>output.err &&
|
2013-06-09 20:29:20 +02:00
|
|
|
test_must_be_empty output.err &&
|
2009-09-25 20:44:44 +02:00
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
2016-04-13 01:02:17 +02:00
|
|
|
cat >>expect <<\EOF
|
2011-06-09 17:55:23 +02:00
|
|
|
list: foo
|
|
|
|
list: bar
|
|
|
|
list: baz
|
|
|
|
EOF
|
|
|
|
test_expect_success '--list keeps list of strings' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --list foo --list=bar --list=baz >output &&
|
2011-06-09 17:55:23 +02:00
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-list resets list' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --list=other --list=irrelevant --list=options \
|
2011-06-09 17:55:23 +02:00
|
|
|
--no-list --list=foo --list=bar --list=baz >output &&
|
|
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
2016-05-05 11:49:58 +02:00
|
|
|
test_expect_success 'multiple quiet levels' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="quiet: 3" -q -q -q
|
2016-05-05 11:49:58 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'multiple verbose levels' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="verbose: 3" -v -v -v
|
2016-05-05 11:49:58 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-quiet sets --quiet to 0' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="quiet: 0" --no-quiet
|
2016-05-05 11:49:58 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-quiet resets multiple -q to 0' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
|
2016-05-05 11:49:58 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-verbose sets verbose to 0' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="verbose: 0" --no-verbose
|
2016-05-05 11:49:58 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--no-verbose resets multiple verbose to 0' '
|
2018-09-09 19:36:29 +02:00
|
|
|
test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
|
2016-05-05 11:49:58 +02:00
|
|
|
'
|
|
|
|
|
tests: disallow the use of abbreviated options (by default)
Git's command-line parsers support uniquely abbreviated options, e.g.
`git init --ba` would automatically expand `--ba` to `--bare`.
This is a very convenient feature in every day life for Git users, in
particular when tab completion is not available.
However, it is not a good idea to rely on that in Git's test suite, as
something that is a unique abbreviation of a command line option today
might no longer be a unique abbreviation tomorrow.
For example, if a future contribution added a new mode
`git init --babyproofing` and a previously-introduced test case used the
fact that `git init --ba` expanded to `git init --bare`, that future
contribution would now have to touch seemingly unrelated tests just to
keep the test suite from failing.
So let's disallow abbreviated options in the test suite by default.
Note: for ease of implementation, this patch really only touches the
`parse-options` machinery: more and more hand-rolled option parsers are
converted to use that internal API, and more and more scripts are
converted to built-ins (naturally using the parse-options API, too), so
in practice this catches most issues, and is definitely the biggest bang
for the buck.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-12 11:37:24 +02:00
|
|
|
test_expect_success 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works' '
|
|
|
|
GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
|
|
|
|
test-tool parse-options --ye &&
|
|
|
|
test_must_fail env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true \
|
|
|
|
test-tool parse-options --ye
|
|
|
|
'
|
|
|
|
|
2019-08-06 16:40:16 +02:00
|
|
|
test_expect_success '--end-of-options treats remainder as args' '
|
|
|
|
test-tool parse-options \
|
|
|
|
--expect="verbose: -1" \
|
|
|
|
--expect="arg 00: --verbose" \
|
|
|
|
--end-of-options --verbose
|
|
|
|
'
|
|
|
|
|
2007-10-13 18:34:45 +02:00
|
|
|
test_done
|