From 00780e83d2a1fe5f8eb9adc1119f285c98ee7226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= Date: Mon, 1 Jun 2020 12:33:39 -0700 Subject: 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 --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 95f2faa..45fc485 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 @@ -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/$@ -- cgit v1.2.1