[GSoC PATCH] t9200: handle missing CVS with skip_all
- From
Pablo Sabater <pabloosabaterr@gmail.com>
- Date
- Mar 11, 2026, 19:40 UTC
- Message-ID
- <20260311194002.190195-1-pabloosabaterr@gmail.com>
CVS initialization runs outside a test_expect_success and when it fails, the error report isn't good.
Wrap CVS initialization in a skip_all check so when CVS initialization fails, the error report becomes clearer.
Move the Git repo initialization into its own test_expect_success instead of being in the same CVS check.
Signed-off-by: Pablo Sabater <pabloosabaterr@gmail.com> --- t/t9200-git-cvsexportcommit.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index a44eabf0d8..cba3b1a28a 100755 --- a/t/t9200-git-cvsexportcommit.sh +++ b/t/t9200-git-cvsexportcommit.sh @@ -30,13 +30,17 @@ export CVSROOT CVSWORK GIT_DIR rm -rf "$CVSROOT" "$CVSWORK" -cvs init && -test -d "$CVSROOT" && -cvs -Q co -d "$CVSWORK" . && -echo >empty && -git add empty && -git commit -q -a -m "Initial" 2>/dev/null || -exit 1 +if ! cvs init || ! test -d "$CVSROOT" || ! cvs -Q co -d "$CVSWORK" . +then + skip_all="cvs repository set-up fails" + test_done +fi + +test_expect_success 'git setup' ' + echo >empty && + git add empty && + git commit -q -a -m Initial +' check_entries () { # $1 == directory, $2 == expected
-- 2.43.0