Merge branch 'v2.42.0-separate-t0021' into v2.42.0-t1301-disable

git.cygport

@@ -135,6 +135,12 @@ src_test() {
 	# because we may want to try to run them later.
 	main_run_skip_tests=()
 
+	# Skip t0021, since it seems to hang when run through prove in GitHub
+	# Actions.  Run it later, outside prove, where it doesn't have that
+	# problem.
+	# https://github.com/me-and/Cygwin-Git/issues/53
+	main_run_skip_tests+=('t0021')
+
 	# Skip t7900 from the main run as it needs a lot of disk space.  If
 	# there's sufficient space later, we can run it then.
 	main_run_skip_tests+=('t7900')
@@ -146,6 +152,9 @@ src_test() {
 
 	GIT_SKIP_TESTS="${GIT_SKIP_TESTS}${GIT_SKIP_TESTS:+ }${main_run_skip_tests[*]}" GIT_TEST_OPTS='--tee -l' DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS="--jobs $(($(nproc 2>/dev/null) + 1)) --timer" cygtest || rc=$?
 
+	# Run t0021 since it was skipped earlier.
+	( cd ${B}/t && echo t0021-*.sh && ./t0021-*.sh --tee -l; ) || rc="$?"
+
 	# Run t7900 if there's at least 10GB free disk space.  It's much more
 	# likely that that's the case now other tests aren't running at the
 	# same time.