Merge branch 'PR/303' into frej/felipec-pr-spree

Closes #303 Closes #304
frej · Mar 27, 2023 · 64ee34d · 64ee34d
2 parents 71834a5 + 90c6ad5
commit 64ee34d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,4 +18,4 @@ jobs:
         submodules: 'recursive'
 
     - name: Run tests
-      run: ./run-tests
+      run: make -C t
diff --git a/t/Makefile b/t/Makefile
@@ -0,0 +1,12 @@
+T = $(wildcard *.t)
+
+test: $(T)
+	@$(MAKE) --silent clean
+
+$(T): clean
+	./$@ $(TEST_OPTS)
+
+clean:
+	@rm -fr test-results
+
+.PHONY: test $(T) clean
diff --git a/t/main.t b/t/main.t
@@ -5,7 +5,7 @@
 
 test_description='Main tests'
 
-. "${SHARNESS_TEST_SRCDIR-/usr/share/sharness}"/sharness.sh || exit 1
+. "${SHARNESS_TEST_SRCDIR-$(dirname "$0")/sharness}"/sharness.sh || exit 1
 
 check() {
 	echo "$3" > expected &&

diff --git a/t/smoke-test.t b/t/smoke-test.t
@@ -8,7 +8,7 @@
 
 test_description='Smoke test'
 
-. "${SHARNESS_TEST_SRCDIR-/usr/share/sharness}"/sharness.sh || exit 1
+. "${SHARNESS_TEST_SRCDIR-$(dirname "$0")/sharness}"/sharness.sh || exit 1
 
 check() {
 	echo "$3" > expected &&