Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

A couple patches to improve test suite support #191

Merged
merged 2 commits into from
Jun 1, 2020
Merged

A couple patches to improve test suite support #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b58825
Need newer bash and make for Macos testing
ingydotnet May 30, 2020
f008b83
Allow override of the run-test-suite branch
ingydotnet May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
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
View file
Open in desktop
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