Revert "Merge remote-tracking branch 'origin/eddie/shregmap_improve' into xc7mux"

[yosys.git] / tests / unit / Makefile

diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 16f65ec206331d03224bc8d7c00b7083771b479e..9f1e5c99ec9d69c521b36cdbaf703a789db46ad7 100644 (file)
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -1,27 +1,34 @@
 GTESTFLAG := -lgtest -lgtest_main
 RPATH := -Wl,-rpath
-EXTRAFLAGS := -lyosys
+EXTRAFLAGS := -lyosys -pthreads
 
-ALLTESTFILE := $(wildcard ./**/*Test.cc)
 OBJTEST := objtest
 BINTEST := bintest
 
-all: prepare $(ALLTESTFILE:%Test.cc=%Test.o)
+ALLTESTFILE := $(shell find -name '*Test.cc' -printf '%P ')
+TESTDIRS := $(sort $(dir $(ALLTESTFILE)))
+TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o)))
 
-%Test.o: %Test.cc
-       $(CXX) -o $(OBJTEST)/$(notdir $@) -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $<
-       $(CXX) -L$(ROOTPATH) $(RPATH)=$(ROOTPATH) -o \
-               $(BINTEST)/$(basename $(notdir $@)) $(OBJTEST)/$(notdir $@) $(LDLIBS) \
+# Prevent make from removing our .o files
+.SECONDARY:
+
+all: prepare $(TESTS) run-tests
+
+$(BINTEST)/%: $(OBJTEST)/%.o
+       $(CXX) -L$(ROOTPATH) $(RPATH)=$(ROOTPATH) -o $@ $^ $(LDLIBS) \
                $(GTESTFLAG) $(EXTRAFLAGS)
-       
+
+$(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc
+       $(CXX) -o $@ -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $^
+
 .PHONY: prepare run-tests clean
 
-run-tests:
-       $(CURDIR)/$(BINTEST)/*
+run-tests: $(TESTS)
+       $(subst Test ,Test; ,$^)
 
 prepare:
-       mkdir -p $(OBJTEST)
-       mkdir -p $(BINTEST)
+       mkdir -p $(addprefix $(BINTEST)/,$(TESTDIRS))
+       mkdir -p $(addprefix $(OBJTEST)/,$(TESTDIRS))
 
 clean:
        rm -rf $(OBJTEST)