mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'mt/test-lib-bundled-short-options'
Minor test usability improvement. * mt/test-lib-bundled-short-options: test-lib: allow short options to be bundled
This commit is contained in:
commit
45fbdf54a2
3
t/README
3
t/README
|
@ -69,7 +69,8 @@ You can also run each test individually from command line, like this:
|
|||
|
||||
You can pass --verbose (or -v), --debug (or -d), and --immediate
|
||||
(or -i) command line argument to the test, or by setting GIT_TEST_OPTS
|
||||
appropriately before running "make".
|
||||
appropriately before running "make". Short options can be bundled, i.e.
|
||||
'-d -v' is the same as '-dv'.
|
||||
|
||||
-v::
|
||||
--verbose::
|
||||
|
|
|
@ -78,20 +78,23 @@ then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Parse options while taking care to leave $@ intact, so we will still
|
||||
# have all the original command line options when executing the test
|
||||
# script again for '--tee' and '--verbose-log' below.
|
||||
store_arg_to=
|
||||
prev_opt=
|
||||
for opt
|
||||
do
|
||||
if test -n "$store_arg_to"
|
||||
opt_required_arg=
|
||||
# $1: option string
|
||||
# $2: name of the var where the arg will be stored
|
||||
mark_option_requires_arg () {
|
||||
if test -n "$opt_required_arg"
|
||||
then
|
||||
eval $store_arg_to=\$opt
|
||||
store_arg_to=
|
||||
prev_opt=
|
||||
continue
|
||||
echo "error: options that require args cannot be bundled" \
|
||||
"together: '$opt_required_arg' and '$1'" >&2
|
||||
exit 1
|
||||
fi
|
||||
opt_required_arg=$1
|
||||
store_arg_to=$2
|
||||
}
|
||||
|
||||
parse_option () {
|
||||
local opt="$1"
|
||||
|
||||
case "$opt" in
|
||||
-d|--d|--de|--deb|--debu|--debug)
|
||||
|
@ -101,7 +104,7 @@ do
|
|||
-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
|
||||
GIT_TEST_LONG=t; export GIT_TEST_LONG ;;
|
||||
-r)
|
||||
store_arg_to=run_list
|
||||
mark_option_requires_arg "$opt" run_list
|
||||
;;
|
||||
--run=*)
|
||||
run_list=${opt#--*=} ;;
|
||||
|
@ -185,12 +188,42 @@ do
|
|||
*)
|
||||
echo "error: unknown test option '$opt'" >&2; exit 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
prev_opt=$opt
|
||||
# Parse options while taking care to leave $@ intact, so we will still
|
||||
# have all the original command line options when executing the test
|
||||
# script again for '--tee' and '--verbose-log' later.
|
||||
for opt
|
||||
do
|
||||
if test -n "$store_arg_to"
|
||||
then
|
||||
eval $store_arg_to=\$opt
|
||||
store_arg_to=
|
||||
opt_required_arg=
|
||||
continue
|
||||
fi
|
||||
|
||||
case "$opt" in
|
||||
--*|-?)
|
||||
parse_option "$opt" ;;
|
||||
-?*)
|
||||
# bundled short options must be fed separately to parse_option
|
||||
opt=${opt#-}
|
||||
while test -n "$opt"
|
||||
do
|
||||
extra=${opt#?}
|
||||
this=${opt%$extra}
|
||||
opt=$extra
|
||||
parse_option "-$this"
|
||||
done
|
||||
;;
|
||||
*)
|
||||
echo "error: unknown test option '$opt'" >&2; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
if test -n "$store_arg_to"
|
||||
then
|
||||
echo "error: $prev_opt requires an argument" >&2
|
||||
echo "error: $opt_required_arg requires an argument" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue