From 824ad04d59c30bca259e1389622dc4eae667ea4a Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Mon, 6 Nov 2023 14:40:30 +0100
Subject: [PATCH] test: run all tests

---
 .builds/test.yml | 11 +++--------
 Makefile         |  7 +++++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.builds/test.yml b/.builds/test.yml
index 97e8e89..a4220ba 100644
--- a/.builds/test.yml
+++ b/.builds/test.yml
@@ -5,15 +5,10 @@ packages:
   - shellspec
   - gojq
   - jq
+  - icu-dev
 sources:
   - https://git.sr.ht/~mil/sxmo-utils
 tasks:
-  - shellcheck: |
+  - test: |
       cd sxmo-utils
-      find . -type f -name '*.sh' -print0 | xargs -0 shellcheck -x --shell=sh
-  - shellspec: |
-      cd sxmo-utils
-      shellspec
-  - editorconfig-check: |
-      cd sxmo-utils
-      ec
+      make test
diff --git a/Makefile b/Makefile
index c80f5da..3416fc9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ EXTERNAL_SERVICES:=1
 
 SCDOC=scdoc
 
-.PHONY: install test shellcheck test_legacy_nerdfont
+.PHONY: install test shellcheck shellspec test_legacy_nerdfont
 
 VERSION:=1.13.0
 
@@ -33,11 +33,14 @@ docs/%: docs/%.scd
 
 all: $(PROGRAMS) $(DOCS)
 
-test: shellcheck test_legacy_nerdfont
+test: shellcheck shellspec test_legacy_nerdfont
 
 shellcheck:
 	find . -type f -name '*.sh' -print0 | xargs -0 shellcheck -x --shell=sh
 
+shellspec:
+	shellspec
+
 test_legacy_nerdfont: programs/test_legacy_nerdfont
 	programs/test_legacy_nerdfont < configs/default_hooks/sxmo_hook_icons.sh