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

@@ -53,4 +53,8 @@ then
 fi
 check_unignored_build_artifacts
 
+case " $MAKE_TARGETS " in
+*" all "*) make -C contrib/subtree test;;
+esac
+
 save_good_tree

ci/run-test-slice.sh

@@ -15,4 +15,7 @@ group "Run tests" make --quiet -C t T="$(cd t &&
 	tr '\n' ' ')" ||
 handle_failed_tests
 
+# 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)