From 3eb3548a00c6fdfcfed6e94cecbc5e3667709cb3 Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Sun, 3 Apr 2022 04:17:36 +0000
Subject: [PATCH] refactor(tests): Use GH Actions matrix for tests.

* To parallelize our tests, generate a dynamic matrix
  of tests to run.
---
 .github/workflows/test.yml | 24 +++++++++++++++++++++---
 app/run-test.sh            |  2 +-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cbe60d04..61bf7183 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,7 +13,24 @@ on:
       - "app/src/**"
 
 jobs:
-  integration_test:
+  collect-tests:
+    outputs:
+      test-dirs: ${{ steps.test-dirs.outputs.test-dirs }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Find test directories
+        id: test-dirs
+        run: |
+          cd app/tests/
+          export TESTS=$(ls -d * | jq -R -s -c 'split("\n")[:-1]')
+          echo "::set-output name=test-dirs::${TESTS}"
+  run-tests:
+    needs: collect-tests
+    strategy:
+      matrix:
+        test: ${{ fromJSON(needs.collect-tests.outputs.test-dirs) }}
     runs-on: ubuntu-latest
     container:
       image: docker.io/zmkfirmware/zmk-build-arm:3.0
@@ -43,8 +60,9 @@ jobs:
         run: west update
       - name: Export Zephyr CMake package (west zephyr-export)
         run: west zephyr-export
-      - name: Test all
-        run: west test
+      - name: Test ${{ matrix.test }}
+        working-directory: app
+        run: west test tests/${{ matrix.test }}
       - name: Archive artifacts
         if: ${{ always() }}
         uses: actions/upload-artifact@v2
diff --git a/app/run-test.sh b/app/run-test.sh
index 9777f185..068fdbb4 100755
--- a/app/run-test.sh
+++ b/app/run-test.sh
@@ -15,7 +15,7 @@ fi
 
 testcases=$(find $path -name native_posix_64.keymap -exec dirname \{\} \;)
 num_cases=$(echo "$testcases" | wc -l)
-if [ $num_cases -gt 1 ]; then
+if [ $num_cases -gt 1 ] || [ "$testcases" != "$path" ]; then
 	echo "" > ./build/tests/pass-fail.log
 	echo "$testcases" | xargs -L 1 -P ${J:-4} ./run-test.sh
 	err=$?