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

git.cygport

@@ -104,6 +104,21 @@ src_install() {
 }
 
 src_test() {
+	git_test_single_script () (
+		cd "${B}/t"
+		script="$1"-*.sh
+		if [[ -x "$script" && -f "$script" ]]; then
+			rc=0
+			printf 'Starting %s\n' "$script"
+			./"$script" --tee -l || rc="$?"
+			printf 'Finished %s (returning %d)\n' "$script" "$rc"
+			return "$rc"
+		else
+			printf -v warning_msg 'Could not parse %q as a unique script: found %q' "$1" "$script"
+			warning "$warning_msg"
+		fi
+	)
+
 	# Test t4018 fails if the files in the build directory are left as
 	# symlinks rather than being real files.
 	rm ${B}/t/t4018/*
@@ -153,15 +168,15 @@ 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="$?"
+	git_test_single_script t0021
 
 	# 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.
 	if (( $(($(stat -f --format="%a*%S" .) / 1024 / 1024 / 1024)) > 10 )); then
-		( cd ${B}/t && echo t7900-*.sh && ./t7900-*.sh --tee -l; ) || rc="$?"
+		git_test_single_script t7900
 	else
-		echo 'Skipping t7900 due to lack of disk space'
+		warning 'Skipping t7900 due to lack of disk space'
 		rc=1
 	fi