Merge pull request #5959 from YosysHQ/improve_test

Improve test

tests/common.mk

@@ -28,6 +28,12 @@ export YOSYS_MAX_THREADS
 export LLVM_PROFILE_FILE
 export LLVM_PROFILE_FILE_BUFFER_SIZE=0
 
+ifeq ($(or $(V),$(VERBOSE)),1)
+  QUIET :=
+else
+  QUIET := >/dev/null 2>&1
+endif
+
 all:
 
 ifndef OVERRIDE_MAIN
@@ -38,7 +44,7 @@ endif
 define run_test
 	@set -e; \
 	rc=0; \
-	( set -e; $(2) ) >/dev/null 2>&1 || rc=$$?; \
+	( set -e; $(2) ) $(QUIET) || rc=$$?; \
 	if [ $$rc -eq 0 ]; then \
 		echo "PASS $1"; \
 		echo PASS > $1.result; \

tests/gen_tests_makefile.py

@@ -26,27 +26,27 @@ def generate_target(name, command, deps = None):
     print(f"\t@$(call run_test,{target}, $({target}_cmd))")
 
 def generate_ys_test(ys_file, yosys_args="", commands=""):
-    cmd = f'$(YOSYS) -ql {ys_file}.err {yosys_args} {ys_file} && mv {ys_file}.err {ys_file}.log'
+    cmd = f'$(YOSYS) -l {ys_file}.err {yosys_args} {ys_file} && mv {ys_file}.err {ys_file}.log'
     if commands:
         cmd += f"; \\\n{commands}"
     generate_target(ys_file, cmd)
 
 def generate_tcl_test(tcl_file, yosys_args="", commands=""):
-    cmd = f'$(YOSYS) -ql {tcl_file}.err {yosys_args} {tcl_file} && mv {tcl_file}.err {tcl_file}.log'
+    cmd = f'$(YOSYS) -l {tcl_file}.err {yosys_args} {tcl_file} && mv {tcl_file}.err {tcl_file}.log'
     if commands:
         cmd += f"; \\\n{commands}"
     generate_target(tcl_file, cmd)
 
 def generate_sv_check(sv_file, yosys_args="", yosys_cmds=""):
     yosys_cmd = f'read -sv {sv_file}; {yosys_cmds}'
-    cmd = f'$(YOSYS) -ql {sv_file}.err -p "{yosys_cmd}" {yosys_args} && mv {sv_file}.err {sv_file}.log'
+    cmd = f'$(YOSYS) -l {sv_file}.err -p "{yosys_cmd}" {yosys_args} && mv {sv_file}.err {sv_file}.log'
     generate_target(sv_file, cmd)
 
 def generate_sv_test(sv_file, yosys_args="", commands=""):
     base = os.path.splitext(sv_file)[0]
     if not os.path.exists(base + ".ys"):
         yosys_cmd = '-p "prep -top top; async2sync; sat -enable_undef -verify -prove-asserts"'
-        cmd = f'$(YOSYS) -ql {sv_file}.err {yosys_cmd} {yosys_args} {sv_file} && mv {sv_file}.err {sv_file}.log'
+        cmd = f'$(YOSYS) -l {sv_file}.err {yosys_cmd} {yosys_args} {sv_file} && mv {sv_file}.err {sv_file}.log'
         if commands:
             cmd += f"; \\\n{commands}"
         generate_target(sv_file, cmd)

tests/unit/Makefile

@@ -1,62 +0,0 @@
-UNAME_S := $(shell uname -s)
-
-# GoogleTest flags
-GTEST_PREFIX := $(shell brew --prefix googletest 2>/dev/null)
-ifeq ($(GTEST_PREFIX),)
-  GTEST_CXXFLAGS :=
-  GTEST_LDFLAGS := -lgtest -lgmock -lgtest_main
-else
-  GTEST_CXXFLAGS := -I$(GTEST_PREFIX)/include
-  GTEST_LDFLAGS := -L$(GTEST_PREFIX)/lib -lgtest -lgmock -lgtest_main
-endif
-
-ifeq ($(UNAME_S),Darwin)
-  RPATH = -Wl,-rpath,$(ROOTPATH)
-else
-  RPATH = -Wl,-rpath=$(ROOTPATH)
-endif
-
-EXTRAFLAGS := -lyosys -pthread
-
-MAKEFILE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-OBJTEST := $(MAKEFILE_DIR)objtest
-BINTEST := $(MAKEFILE_DIR)bintest
-
-ALLTESTFILE := $(shell cd $(MAKEFILE_DIR) && find . -name '*Test.cc' | sed 's|^\./||' | tr '\n' ' ')
-TESTDIRS := $(sort $(dir $(ALLTESTFILE)))
-TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o)))
-
-# Prevent make from removing our .o files
-.SECONDARY:
-
-all: prepare $(TESTS) run-tests
-
-$(BINTEST)/%: $(OBJTEST)/%.o | prepare
-	$(CXX) -L$(ROOTPATH) $(RPATH) $(LINKFLAGS) -o $@ $^ $(LIBS) \
-		$(GTEST_LDFLAGS) $(EXTRAFLAGS)
-
-$(OBJTEST)/%.o: $(MAKEFILE_DIR)/%.cc | prepare
-	$(CXX) -o $@ -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $(GTEST_CXXFLAGS) $^
-
-.PHONY: prepare run-tests clean
-
-run-tests: $(TESTS)
-ifeq ($(UNAME_S),Darwin)
-	@for t in $^; do \
-		echo "Running $$t"; \
-		DYLD_LIBRARY_PATH=$(ROOTPATH) $$t || exit 1; \
-	done
-else
-	@for t in $^; do \
-		echo "Running $$t"; \
-		$$t || exit 1; \
-	done
-endif
-
-prepare:
-	mkdir -p $(addprefix $(BINTEST)/,$(TESTDIRS))
-	mkdir -p $(addprefix $(OBJTEST)/,$(TESTDIRS))
-
-clean:
-	rm -rf $(OBJTEST)
-	rm -rf $(BINTEST)