Make tests real targets.

controller/.gitignore

 dt_ctrl
 *.dot
 *.pdf
+*.test.output
+test.output

controller/block/build.mk

@@ -95,23 +95,23 @@ CLEAN += $(BLOCK_TARGETS) $(BLOCK_OBJS) $(BLOCK_OBJS:.lo=.o)
 SRCS += $(BLOCK_SRCS)
 
 CTRL_TESTS += \
-	$(DIR)/block_bridge_pwm.test.ctrl \
-	$(DIR)/block_command_bool.test.ctrl \
-	$(DIR)/block_command_float.test.ctrl \
-	$(DIR)/block_gain.test.ctrl \
-	$(DIR)/block_limit.test.ctrl \
-	$(DIR)/block_limit_switch.test.ctrl \
-	$(DIR)/block_limit_var.test.ctrl \
-	$(DIR)/block_log.test.ctrl \
-	$(DIR)/block_matrix_2x2.test.ctrl \
-	$(DIR)/block_not.test.ctrl \
-	$(DIR)/block_oneshot.test.ctrl \
-	$(DIR)/block_pid_aw.test.ctrl \
-	$(DIR)/block_rangecheck.test.ctrl \
-	$(DIR)/block_setpoint_generator_1d.test.ctrl \
-	$(DIR)/block_setpoint_generator_3d.test.ctrl \
-	$(DIR)/block_servo_state.test.ctrl \
-	$(DIR)/block_state_machine.test.ctrl \
-	$(DIR)/block_quadrature_decoder.test.ctrl \
-	$(DIR)/block_quantize.test.ctrl
+	$(DIR)/block_bridge_pwm.test.output \
+	$(DIR)/block_command_bool.test.output \
+	$(DIR)/block_command_float.test.output \
+	$(DIR)/block_gain.test.output \
+	$(DIR)/block_limit.test.output \
+	$(DIR)/block_limit_switch.test.output \
+	$(DIR)/block_limit_var.test.output \
+	$(DIR)/block_log.test.output \
+	$(DIR)/block_matrix_2x2.test.output \
+	$(DIR)/block_not.test.output \
+	$(DIR)/block_oneshot.test.output \
+	$(DIR)/block_pid_aw.test.output \
+	$(DIR)/block_rangecheck.test.output \
+	$(DIR)/block_setpoint_generator_1d.test.output \
+	$(DIR)/block_setpoint_generator_3d.test.output \
+	$(DIR)/block_servo_state.test.output \
+	$(DIR)/block_state_machine.test.output \
+	$(DIR)/block_quadrature_decoder.test.output \
+	$(DIR)/block_quantize.test.output
 

controller/build.mk

@@ -52,21 +52,22 @@ $(DIR)/dt_ctrl_LDFLAGS += \
 	$(TRIGGERS)
 $(DIR)/dt_ctrl: $(DT_CTRL_OBJS)
 
-test: dt_ctrl_test
+# Make test reports as part of the test target
 
 DT_CTRL_TESTS := $(CTRL_TESTS)
 DT_CTRL := $(DIR)/dt_ctrl
-define DT_CTRL_TEST
-	$(DT_CTRL) $1
 
-endef
+test: $(DIR)/test.output
 
-dt_ctrl_test: $(DIR)/dt_ctrl
-dt_ctrl_test:
-	echo tests: $(DT_CTRL_TESTS)
-	$(foreach TESTITEM,$(DT_CTRL_TESTS),$(call DT_CTRL_TEST,$(TESTITEM)))
+$(DIR)/test.output: $(DT_CTRL_TESTS)
+
+$(DT_CTRL_TESTS): $(DT_CTRL)
+
+%.test.output: %.test.ctrl
+	@echo "DT_CTRL $<"
+	@$(DT_CTRL) $< >$@
 
 
 SRCS += $(DT_CTRL_SRCS)
 TARGETS += $(DT_CTRL_TARGETS)
-CLEAN += $(DT_CTRL_TARGETS) $(DT_CTRL_OBJS)
+CLEAN += $(DT_CTRL_TARGETS) $(DT_CTRL_OBJS) $(DT_CTRL_TESTS)

controller/test/build.mk

@@ -33,10 +33,10 @@ SRCS += $(TEST_BLOCK_SRCS)
 
 
 CTRL_TESTS += \
-	$(DIR)/test.ctrl \
-	$(DIR)/test_import.ctrl \
-	$(DIR)/test_link.ctrl \
-	$(DIR)/test_module.ctrl \
-	$(DIR)/test_multifrequency.ctrl \
+	$(DIR)/test.test.output \
+	$(DIR)/test_import.test.output \
+	$(DIR)/test_link.test.output \
+	$(DIR)/test_module.test.output \
+	$(DIR)/test_multifrequency.test.output \
 
 

controller/vesp/build.mk

@@ -27,6 +27,6 @@ SRCS += $(VESP_BLOCK_SRCS)
 
 
 CTRL_TESTS += \
-	$(DIR)/vesp.ctrl
+	$(DIR)/vesp.test.output