merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
Vincent Ambo
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
123
third_party/git/t/t0000-basic.sh
vendored
123
third_party/git/t/t0000-basic.sh
vendored
|
|
@ -20,9 +20,9 @@ modification *should* take notice and update the test vectors here.
|
|||
|
||||
. ./test-lib.sh
|
||||
|
||||
try_local_x () {
|
||||
local x="local" &&
|
||||
echo "$x"
|
||||
try_local_xy () {
|
||||
local x="local" y="alsolocal" &&
|
||||
echo "$x $y"
|
||||
}
|
||||
|
||||
# Check whether the shell supports the "local" keyword. "local" is not
|
||||
|
|
@ -35,11 +35,12 @@ try_local_x () {
|
|||
# relying on "local".
|
||||
test_expect_success 'verify that the running shell supports "local"' '
|
||||
x="notlocal" &&
|
||||
echo "local" >expected1 &&
|
||||
try_local_x >actual1 &&
|
||||
y="alsonotlocal" &&
|
||||
echo "local alsolocal" >expected1 &&
|
||||
try_local_xy >actual1 &&
|
||||
test_cmp expected1 actual1 &&
|
||||
echo "notlocal" >expected2 &&
|
||||
echo "$x" >actual2 &&
|
||||
echo "notlocal alsonotlocal" >expected2 &&
|
||||
echo "$x $y" >actual2 &&
|
||||
test_cmp expected2 actual2
|
||||
'
|
||||
|
||||
|
|
@ -126,7 +127,7 @@ check_sub_test_lib_test () {
|
|||
|
||||
check_sub_test_lib_test_err () {
|
||||
name="$1" # stdin is the expected output from the test
|
||||
# expected error output is in descriptior 3
|
||||
# expected error output is in descriptor 3
|
||||
(
|
||||
cd "$name" &&
|
||||
sed -e 's/^> //' -e 's/Z$//' >expect.out &&
|
||||
|
|
@ -154,7 +155,7 @@ test_expect_success 'pretend we have a fully passing test suite' "
|
|||
"
|
||||
|
||||
test_expect_success 'pretend we have a partially passing test suite' "
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
run_sub_test_lib_test_err \
|
||||
partial-pass '2/3 tests passing' <<-\\EOF &&
|
||||
test_expect_success 'passing test #1' 'true'
|
||||
test_expect_success 'failing test #2' 'false'
|
||||
|
|
@ -218,7 +219,7 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su
|
|||
"
|
||||
|
||||
test_expect_success 'pretend we have a pass, fail, and known breakage' "
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
run_sub_test_lib_test_err \
|
||||
mixed-results1 'mixed results #1' <<-\\EOF &&
|
||||
test_expect_success 'passing test' 'true'
|
||||
test_expect_success 'failing test' 'false'
|
||||
|
|
@ -237,7 +238,7 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' "
|
|||
"
|
||||
|
||||
test_expect_success 'pretend we have a mix of all possible results' "
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
run_sub_test_lib_test_err \
|
||||
mixed-results2 'mixed results #2' <<-\\EOF &&
|
||||
test_expect_success 'passing test' 'true'
|
||||
test_expect_success 'passing test' 'true'
|
||||
|
|
@ -273,24 +274,24 @@ test_expect_success 'pretend we have a mix of all possible results' "
|
|||
"
|
||||
|
||||
test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
test-verbose "test verbose" --verbose <<-\EOF &&
|
||||
run_sub_test_lib_test_err \
|
||||
t1234-verbose "test verbose" --verbose <<-\EOF &&
|
||||
test_expect_success "passing test" true
|
||||
test_expect_success "test with output" "echo foo"
|
||||
test_expect_success "failing test" false
|
||||
test_done
|
||||
EOF
|
||||
mv test-verbose/out test-verbose/out+ &&
|
||||
grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out &&
|
||||
check_sub_test_lib_test test-verbose <<-\EOF
|
||||
> expecting success: true
|
||||
mv t1234-verbose/out t1234-verbose/out+ &&
|
||||
grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out &&
|
||||
check_sub_test_lib_test t1234-verbose <<-\EOF
|
||||
> expecting success of 1234.1 '\''passing test'\'': true
|
||||
> ok 1 - passing test
|
||||
> Z
|
||||
> expecting success: echo foo
|
||||
> expecting success of 1234.2 '\''test with output'\'': echo foo
|
||||
> foo
|
||||
> ok 2 - test with output
|
||||
> Z
|
||||
> expecting success: false
|
||||
> expecting success of 1234.3 '\''failing test'\'': false
|
||||
> not ok 3 - failing test
|
||||
> # false
|
||||
> Z
|
||||
|
|
@ -300,18 +301,18 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
|
|||
'
|
||||
|
||||
test_expect_success 'test --verbose-only' '
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
test-verbose-only-2 "test verbose-only=2" \
|
||||
run_sub_test_lib_test_err \
|
||||
t2345-verbose-only-2 "test verbose-only=2" \
|
||||
--verbose-only=2 <<-\EOF &&
|
||||
test_expect_success "passing test" true
|
||||
test_expect_success "test with output" "echo foo"
|
||||
test_expect_success "failing test" false
|
||||
test_done
|
||||
EOF
|
||||
check_sub_test_lib_test test-verbose-only-2 <<-\EOF
|
||||
check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF
|
||||
> ok 1 - passing test
|
||||
> Z
|
||||
> expecting success: echo foo
|
||||
> expecting success of 2345.2 '\''test with output'\'': echo foo
|
||||
> foo
|
||||
> ok 2 - test with output
|
||||
> Z
|
||||
|
|
@ -391,6 +392,44 @@ test_expect_success 'GIT_SKIP_TESTS sh pattern' "
|
|||
)
|
||||
"
|
||||
|
||||
test_expect_success 'GIT_SKIP_TESTS entire suite' "
|
||||
(
|
||||
GIT_SKIP_TESTS='git' && export GIT_SKIP_TESTS &&
|
||||
run_sub_test_lib_test git-skip-tests-entire-suite \
|
||||
'GIT_SKIP_TESTS entire suite' <<-\\EOF &&
|
||||
for i in 1 2 3
|
||||
do
|
||||
test_expect_success \"passing test #\$i\" 'true'
|
||||
done
|
||||
test_done
|
||||
EOF
|
||||
check_sub_test_lib_test git-skip-tests-entire-suite <<-\\EOF
|
||||
> 1..0 # SKIP skip all tests in git
|
||||
EOF
|
||||
)
|
||||
"
|
||||
|
||||
test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' "
|
||||
(
|
||||
GIT_SKIP_TESTS='notgit' && export GIT_SKIP_TESTS &&
|
||||
run_sub_test_lib_test git-skip-tests-unmatched-suite \
|
||||
'GIT_SKIP_TESTS does not skip unmatched suite' <<-\\EOF &&
|
||||
for i in 1 2 3
|
||||
do
|
||||
test_expect_success \"passing test #\$i\" 'true'
|
||||
done
|
||||
test_done
|
||||
EOF
|
||||
check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\\EOF
|
||||
> ok 1 - passing test #1
|
||||
> ok 2 - passing test #2
|
||||
> ok 3 - passing test #3
|
||||
> # passed all 3 test(s)
|
||||
> 1..3
|
||||
EOF
|
||||
)
|
||||
"
|
||||
|
||||
test_expect_success '--run basic' "
|
||||
run_sub_test_lib_test run-basic \
|
||||
'--run basic' --run='1 3 5' <<-\\EOF &&
|
||||
|
|
@ -795,7 +834,7 @@ then
|
|||
fi
|
||||
|
||||
test_expect_success 'tests clean up even on failures' "
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
run_sub_test_lib_test_err \
|
||||
failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
|
||||
test_expect_success 'tests clean up even after a failure' '
|
||||
touch clean-after-failure &&
|
||||
|
|
@ -824,7 +863,7 @@ test_expect_success 'tests clean up even on failures' "
|
|||
"
|
||||
|
||||
test_expect_success 'test_atexit is run' "
|
||||
test_must_fail run_sub_test_lib_test \
|
||||
run_sub_test_lib_test_err \
|
||||
atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
|
||||
test_expect_success 'tests clean up even after a failure' '
|
||||
> ../../clean-atexit &&
|
||||
|
|
@ -878,6 +917,40 @@ test_expect_success 'test_oid can look up data for SHA-256' '
|
|||
test "$hexsz" -eq 64
|
||||
'
|
||||
|
||||
test_expect_success 'test_bool_env' '
|
||||
(
|
||||
sane_unset envvar &&
|
||||
|
||||
test_bool_env envvar true &&
|
||||
! test_bool_env envvar false &&
|
||||
|
||||
envvar= &&
|
||||
export envvar &&
|
||||
! test_bool_env envvar true &&
|
||||
! test_bool_env envvar false &&
|
||||
|
||||
envvar=true &&
|
||||
test_bool_env envvar true &&
|
||||
test_bool_env envvar false &&
|
||||
|
||||
envvar=false &&
|
||||
! test_bool_env envvar true &&
|
||||
! test_bool_env envvar false &&
|
||||
|
||||
envvar=invalid &&
|
||||
# When encountering an invalid bool value, test_bool_env
|
||||
# prints its error message to the original stderr of the
|
||||
# test script, hence the redirection of fd 7, and aborts
|
||||
# with "exit 1", hence the subshell.
|
||||
! ( test_bool_env envvar true ) 7>err &&
|
||||
grep "error: test_bool_env requires bool values" err &&
|
||||
|
||||
envvar=true &&
|
||||
! ( test_bool_env envvar invalid ) 7>err &&
|
||||
grep "error: test_bool_env requires bool values" err
|
||||
)
|
||||
'
|
||||
|
||||
################################################################
|
||||
# Basics of the basics
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue