From 1a864c72aedcdb111f3ba797445061975aaf3595 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 10 Mar 2026 10:08:52 +0100 Subject: [PATCH] Make sure targets are built for tests --- Makefile | 2 +- tests/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 104a535a6..8a38910d6 100644 --- a/Makefile +++ b/Makefile @@ -922,7 +922,7 @@ test: vanilla-test unit-test .PHONY: vanilla-test -vanilla-test: +vanilla-test: $(TARGETS) $(EXTRA_TARGETS) @$(MAKE) -C tests vanilla-test \ $(if $(ENABLE_VERIFIC),ENABLE_VERIFIC=$(ENABLE_VERIFIC)) \ $(if $(YOSYS_NOVERIFIC),YOSYS_NOVERIFIC=$(YOSYS_NOVERIFIC)) diff --git a/tests/Makefile b/tests/Makefile index 7f4e0f739..e82c2f718 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -71,14 +71,14 @@ all: vanilla-test .PHONY: seed-tests seed-tests: $(SH_TEST_DIRS:%=seed-./%) .PHONY: seed-./% -seed-./%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS) +seed-./%: %/run-test.sh +cd $* && bash run-test.sh $(SEEDOPT) +@echo "...passed tests in $*" # abcopt-./ is a dummy string, not a directory .PHONY: abcopt-tests abcopt-tests: $(SH_ABC_TEST_DIRS:%=abcopt-./%) -abcopt-./%: %/run-test.sh $(TARGETS) $(EXTRA_TARGETS) +abcopt-./%: %/run-test.sh +cd $* && bash run-test.sh $(ABCOPT) $(SEEDOPT) +@echo "...passed tests in $*" @@ -89,7 +89,7 @@ makefile-tests: $(MK_TEST_DIRS:%=makefile-./%) %.mk: +cd $(dir $*) && bash run-test.sh # this one spawns submake on each -makefile-./%: %/run-test.mk $(TARGETS) $(EXTRA_TARGETS) +makefile-./%: %/run-test.mk $(MAKE) -C $* -f run-test.mk +@echo "...passed tests in $*"