ci: run contrib/subtree tests in CI builds

Because `git subtree` (unlike most other `contrib` modules) is included as part of the standard release of Git for Windows, its stability should be verified as consistently as it is for the rest of git. By including the `git subtree` tests in the CI workflow, these tests are as much of a gate to merging and indicator of stability as the standard test suite. Signed-off-by: Victoria Dye <[email protected]>
git-for-windows · Aug 11, 2021 · abf831b · abf831b
1 parent 60003ba
commit abf831b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
@@ -27,21 +27,21 @@ linux-gcc)
 	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
 	export GIT_TEST_WRITE_REV_INDEX=1
 	export GIT_TEST_CHECKOUT_WORKERS=2
-	make test
+	make test && make -C contrib/subtree test || exit 1
 	;;
 linux-clang)
 	export GIT_TEST_DEFAULT_HASH=sha1
 	make test
 	export GIT_TEST_DEFAULT_HASH=sha256
-	make test
+	make test && make -C contrib/subtree test || exit 1
 	;;
 linux-gcc-4.8)
 	# Don't run the tests; we only care about whether Git can be
 	# built with GCC 4.8, as it errors out on some undesired (C99)
 	# constructs that newer compilers seem to quietly accept.
 	;;
 *)
-	make test
+	make test && make -C contrib/subtree test || exit 1
 	;;
 esac
 

diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
@@ -14,4 +14,7 @@ make --quiet -C t T="$(cd t &&
 	./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
 	tr '\n' ' ')"
 
+# Run the git subtree tests only if main tests succeeded
+test 0 != "$1" || make -C contrib/subtree test
+
 check_unignored_build_artifacts