From 1d89602d2092828c699ca3e8501931f62b557ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= <ingy@ingy.net>
Date: Tue, 16 Jun 2020 09:05:03 -0700
Subject: [PATCH] wip

---
 .github/workflows/main.yml |  2 +-
 .gitignore                 |  2 +-
 .makefile                  |  5 ++---
 Makefile.am                | 24 +++++++++++++-----------
 tests/run-all-tests.sh     |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c2bdef47..e8eeb0d7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
 
     - run: |
         git clean -d -x -f
-        rm -fr tests/run-test-suite
+        rm -fr libyaml-test
         git worktree prune
 
     - name: Compiler version
diff --git a/.gitignore b/.gitignore
index a78199ce..7c8f2230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ config.h*
 stamp-h1
 !config/config.h.in
 /packaging/
-/test-suite/
+/libyaml-test/
 /tests/run-dumper
 /tests/run-emitter
 /tests/run-emitter-test-suite
diff --git a/.makefile b/.makefile
index 33b44a53..06d17895 100644
--- a/.makefile
+++ b/.makefile
@@ -28,8 +28,7 @@ MAKE_TARGETS := \
 	test-all \
 	test-suite \
 
-# SOURCE_FILES := $(shell find . | grep '\.c$$')
-SOURCE_FILES := $(shell find test-suite | grep '\.c$$')
+SOURCE_FILES := $(shell find . | grep '\.c$$')
 ifneq ($(shell which gindent),)
 INDENT := gindent
 else
@@ -59,4 +58,4 @@ indent:
 
 distclean purge:
 	git clean -dxf -e GNUmakefile
-	rm -fr test-suite
+	rm -fr libyaml-test
diff --git a/Makefile.am b/Makefile.am
index 01cff273..9e7c84be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,12 +7,12 @@ EXTRA_DIST = Changes ReadMe.md License CMakeLists.txt doc/doxygen.cfg
 
 export LIBYAML_ROOT := $(PWD)
 
-LIBYAML_TEST_SUITE_REPO ?= https://github.com/yaml/libyaml-test-suite
-# LIBYAML_TEST_SUITE_COMMIT ?= 1f1b00ab6763647d05e44200b63fa62f1d2269a3
+LIBYAML_TEST_REPO ?= https://github.com/yaml/libyaml-test
+# LIBYAML_TEST_COMMIT ?= 1f1b00ab6763647d05e44200b63fa62f1d2269a3
 
-# NOTE: Uncomment to use a local copy of libyaml-test-suite
-#   LIBYAML_TEST_SUITE_REPO := ../libyaml-test-suite/.git
-LIBYAML_TEST_SUITE_COMMIT := devel
+# NOTE: Uncomment to use a local copy of libyaml-test
+#   LIBYAML_TEST_REPO := ../libyaml-test/.git
+LIBYAML_TEST_COMMIT := origin/devel
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = yaml-0.1.pc
@@ -22,10 +22,10 @@ maintainer-clean-local:
 	-find ${builddir} -name Makefile.in -exec rm -f '{}' ';'
 
 distclean-local:
-	rm -fr test-suite packaging
+	rm -fr libyaml-test packaging
 	-git worktree prune
 
-.PHONY: bootstrap test-suite
+.PHONY: bootstrap libyaml-test
 bootstrap: maintainer-clean
 	./bootstrap
 	./configure
@@ -36,10 +36,12 @@ test-all: test test-suite
 test: all
 	make -C tests check-TESTS
 
-test-suite: all
-	-git clone $(LIBYAML_TEST_SUITE_REPO) $@
-	( cd $@ && git reset --hard $(LIBYAML_TEST_SUITE_COMMIT) )
-	make -C $@ test
+test-suite: libyaml-test all
+	make -C $< $@
+
+libyaml-test:
+	-git clone $(LIBYAML_TEST_REPO) $@
+	( cd $@ && git reset --hard $(LIBYAML_TEST_COMMIT) )
 
 docker-dist: packaging
 	make -C $</docker libyaml-dist
diff --git a/tests/run-all-tests.sh b/tests/run-all-tests.sh
index 9be620f9..ea59ced0 100755
--- a/tests/run-all-tests.sh
+++ b/tests/run-all-tests.sh
@@ -22,7 +22,7 @@ main() {
 
 clean() {
   git clean -d -x -f
-  rm -fr test-suite
+  rm -fr libyaml-test
 }
 
 main "$@"