Skip to content

Commit

Permalink
A couple patches to improve test suite support (#191)
Browse files Browse the repository at this point in the history
* Need newer bash and make for Macos testing

* Allow override of the run-test-suite branch
  • Loading branch information
ingydotnet authored Jun 1, 2020
1 parent 1008696 commit 00780e8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ jobs:
- name: Install software
run: |
if [[ '${{ matrix.os }}' == macOS-latest ]]; then
brew install automake coreutils
brew install automake bash coreutils make
echo ::add-path::/usr/local/opt/coreutils/libexec/gnubin
echo ::add-path::/usr/local/opt/make/libexec/gnubin
fi
- name: Fetch branches
run: |
Expand Down
6 changes: 4 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ SUBDIRS = include src . tests

EXTRA_DIST = Changes ReadMe.md License CMakeLists.txt doc/doxygen.cfg

LIBYAML_TEST_SUITE_RUN_BRANCH ?= run-test-suite

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = yaml-0.1.pc

Expand All @@ -31,9 +33,9 @@ test-suite: tests/run-test-suite all
test-all: test test-suite

tests/run-test-suite:
-git branch --track run-test-suite origin/run-test-suite
-git branch --track $(LIBYAML_TEST_SUITE_RUN_BRANCH) origin/$(LIBYAML_TEST_SUITE_RUN_BRANCH)
-git worktree prune
git worktree add $@ run-test-suite
git worktree add $@ $(LIBYAML_TEST_SUITE_RUN_BRANCH)

packaging:
-git branch --track $@ origin/$@
Expand Down

0 comments on commit 00780e8

Please sign in to comment.