CI: makefile improvements

- detects changes to ino files
- detects failures from individual targets
- allows more parallel operation
- clones required git repos at specific commit points
- moves UnixHostDuino path assignment to parent makefile

Author: contrem

.github/workflows/aunit_tests.yml

@@ -1,6 +1,6 @@
 name: arduino-timer unit tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -10,16 +10,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup
-      run: |
-        cd ..
-        git clone https://github.com/bxparks/UnixHostDuino
-        git clone https://github.com/bxparks/AUnit
-    - name: Build Tests
+    - name: Build
       run: |
         make -C extras/tests
-    - name: Run Tests
+    - name: Run
       run: |
-        make -C extras/tests
         make -C extras/tests runtests
 

Makefile

@@ -6,3 +6,6 @@ $(NAME)-$(VERSION).zip:
 
 tag:
 	git tag $(VERSION)
+
+test:
+	$(MAKE) -C extras/tests/ test

extras/tests/Makefile

@@ -1,20 +1,50 @@
-tests:
-	set -e; \
-	for i in *Test/Makefile; do \
-		echo '==== Making:' $$(dirname $$i); \
-		make -C $$(dirname $$i) -j; \
-	done
-
-runtests:
-	set -e; \
-	for i in *Test/Makefile; do \
-		echo '==== Running:' $$(dirname $$i); \
-		$$(dirname $$i)/$$(dirname $$i).out; \
-	done
-
-clean:
-	set -e; \
-	for i in *Test/Makefile; do \
-		echo '==== Cleaning:' $$(dirname $$i); \
-		make -C $$(dirname $$i) clean; \
-	done
+TESTS := $(wildcard *Test)
+
+UNIXHOSTDUINO := ../../../UnixHostDuino/UnixHostDuino.mk
+UNIXHOSTDUINO_URL := https://github.com/bxparks/UnixHostDuino
+UNIXHOSTDUINO_TAG := 1936444e0097a37ad268e5e3d6e6cca8d957a86b
+AUNIT := ../../../AUnit/
+AUNIT_URL := https://github.com/bxparks/AUnit
+AUNIT_TAG := e0aa8dfb635101d170cdb9fd9669e1d8047e2db1
+
+### ### ###
+
+UHD_DIR := $(dir $(UNIXHOSTDUINO))
+AU_DIR := $(dir $(AUNIT))
+SUB_DIRS := $(addsuffix /, $(TESTS))
+TEST_DIRS := $(join $(SUB_DIRS), $(TESTS))
+
+INOS := $(addsuffix .ino, $(join $(SUB_DIRS), $(TESTS)))
+BINS := $(addsuffix .out, $(TEST_DIRS))
+RUNS := $(addsuffix .run, $(BINS))
+CLEANS := $(addsuffix .clean, $(SUB_DIRS))
+
+all: $(BINS)
+
+$(UHD_DIR):
+	git clone $(UNIXHOSTDUINO_URL) $@
+	cd $@; git checkout $(UNIXHOSTDUINO_TAG)
+
+$(AU_DIR):
+	git clone $(AUNIT_URL) $@
+	cd $@; git checkout $(AUNIT_TAG)
+
+$(BINS): $(INOS) $(UHD_DIR) $(AU_DIR)
+	# ==== Building: $(dir $@)
+	$(MAKE) UNIXHOSTDUINO=../$(UNIXHOSTDUINO) -C $(dir $@)
+
+$(RUNS): $(BINS)
+	# ==== Running: $(@:.run=)
+	$(@:.run=)
+
+$(CLEANS):
+	# ==== Cleaning: $(@:.clean=)
+	$(MAKE) UNIXHOSTDUINO=../$(UNIXHOSTDUINO) -C $(@:.clean=) clean
+
+tests: $(BINS)
+
+runtests: $(RUNS)
+
+clean: $(CLEANS)
+
+test: runtests clean

extras/tests/timerTest/Makefile

@@ -5,4 +5,5 @@
 APP_NAME := timerTest
 ARDUINO_LIBS := AUnit arduino-timer
 CPPFLAGS += -Werror
-include ../../../../UnixHostDuino/UnixHostDuino.mk
+
+include $(UNIXHOSTDUINO)