From 2bf7aac9d12d79695d858fb6590adeb35f0691fe Mon Sep 17 00:00:00 2001 From: "Emil J. Tywoniak" Date: Thu, 6 Nov 2025 13:59:14 +0100 Subject: [PATCH] Makefile: clean unit test on clean, ensure prepared to fix parallelism --- Makefile | 2 +- tests/unit/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 93091bd6d..7ee59bb79 100644 --- a/Makefile +++ b/Makefile @@ -1135,7 +1135,7 @@ DOC_TARGET ?= html docs: docs/prep $(Q) $(MAKE) -C docs $(DOC_TARGET) -clean: clean-py +clean: clean-py clean-unit-test rm -rf share rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) rm -f kernel/version_*.o kernel/version_*.cc diff --git a/tests/unit/Makefile b/tests/unit/Makefile index eee60ef9f..b275d7f41 100644 --- a/tests/unit/Makefile +++ b/tests/unit/Makefile @@ -30,11 +30,11 @@ TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o))) all: prepare $(TESTS) run-tests -$(BINTEST)/%: $(OBJTEST)/%.o +$(BINTEST)/%: $(OBJTEST)/%.o | prepare $(CXX) -L$(ROOTPATH) $(RPATH) $(LINKFLAGS) -o $@ $^ $(LIBS) \ $(GTEST_LDFLAGS) $(EXTRAFLAGS) -$(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc +$(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc | prepare $(CXX) -o $@ -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $(GTEST_CXXFLAGS) $^ .PHONY: prepare run-tests clean