Merge pull request #3349 from vdye/feature/ci-subtree-tests

Add `contrib/subtree` test execution to CI builds

Author: dscho

ci/run-build-and-tests.sh

@@ -49,6 +49,10 @@ pedantic)
 esac
 
 group Build make
+case " $MAKE_TARGETS " in
+*" all "*) group "Build git-subtree" \
+	make -C contrib/subtree $(test -n "$run_tests" && echo test || echo all);;
+esac
 if test -n "$run_tests"
 then
 	group "Run tests" make test ||

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

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)