# HG changeset patch # User Ingy döt Net <ingy@ingy.net> # Date 1591040019 25200 # Mon Jun 01 12:33:39 2020 -0700 # Node ID 385738fd793a464ac35422c507dc9abe9b4d994a # Parent c09fc69134da52ca290813534c27f8c95eca8979 A couple patches to improve test suite support (#191) * Need newer bash and make for Macos testing * Allow override of the run-test-suite branch diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,9 @@ - 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: | diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,8 @@ 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 @@ -31,9 +33,9 @@ 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/$@