Merge pull request git-for-windows#3349 from vdye/feature/ci-subtree-…

…tests Add `contrib/subtree` test execution to CI builds
dscho · Nov 25, 2024 · c62654f · c62654f
2 parents 90951bc + d537e6c
commit c62654f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
@@ -56,4 +56,8 @@ then
 fi
 check_unignored_build_artifacts
 
+case " $MAKE_TARGETS " in
+*" all "*) make -C contrib/subtree test;;
+esac
+
 save_good_tree
diff --git a/ci/run-test-slice.sh b/ci/run-test-slice.sh
@@ -20,4 +20,7 @@ if [ "$1" == "0" ] ; then
 	group "Run unit tests" make --quiet -C t unit-tests-test-tool
 fi
 
+# Run the git subtree tests only if main tests succeeded
+test 0 != "$1" || make -C contrib/subtree test
+
 check_unignored_build_artifacts
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
@@ -94,7 +94,7 @@ $(GIT_SUBTREE_TEST): $(GIT_SUBTREE)
 	cp $< $@
 
 test: $(GIT_SUBTREE_TEST)
-	$(MAKE) -C t/ test
+	$(MAKE) -C t/ all
 
 clean:
 	$(RM) $(GIT_SUBTREE)