Skip to content

Commit

Permalink
Merge pull request #3349 from vdye/feature/ci-subtree-tests
Browse files Browse the repository at this point in the history 
Add `contrib/subtree` test execution to CI builds
  • Loading branch information
@dscho
dscho committed Jan 7, 2025
2 parents 8aa979e + 543ed4c commit ae0f662
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions ci/run-build-and-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand Down
3 changes: 3 additions & 0 deletions ci/run-test-slice.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion contrib/subtree/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ae0f662

Please sign in to comment.