Skip to content

Commit abf831b

Browse files
committed
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]>
1 parent 60003ba commit abf831b

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

ci/run-build-and-tests.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ linux-gcc)
2727
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
2828
export GIT_TEST_WRITE_REV_INDEX=1
2929
export GIT_TEST_CHECKOUT_WORKERS=2
30-
make test
30+
make test && make -C contrib/subtree test || exit 1
3131
;;
3232
linux-clang)
3333
export GIT_TEST_DEFAULT_HASH=sha1
3434
make test
3535
export GIT_TEST_DEFAULT_HASH=sha256
36-
make test
36+
make test && make -C contrib/subtree test || exit 1
3737
;;
3838
linux-gcc-4.8)
3939
# Don't run the tests; we only care about whether Git can be
4040
# built with GCC 4.8, as it errors out on some undesired (C99)
4141
# constructs that newer compilers seem to quietly accept.
4242
;;
4343
*)
44-
make test
44+
make test && make -C contrib/subtree test || exit 1
4545
;;
4646
esac
4747

ci/run-test-slice.sh

+3
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,7 @@ make --quiet -C t T="$(cd t &&
1414
./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
1515
tr '\n' ' ')"
1616

17+
# Run the git subtree tests only if main tests succeeded
18+
test 0 != "$1" || make -C contrib/subtree test
19+
1720
check_unignored_build_artifacts

0 commit comments

Comments
 (0)