From c08a2aa3ff5293c2bf63cf7f97a24f0aacd75ea1 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 10 Mar 2026 11:02:20 +0100 Subject: [PATCH] Do not write to console for makefile-tests --- tests/Makefile | 27 ++++++++++++++------------- tests/gen-tests-makefile.sh | 4 ++-- tests/sim/run-test.sh | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index e82c2f718..aaa921ab3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -79,19 +79,20 @@ seed-./%: %/run-test.sh .PHONY: abcopt-tests abcopt-tests: $(SH_ABC_TEST_DIRS:%=abcopt-./%) abcopt-./%: %/run-test.sh - +cd $* && bash run-test.sh $(ABCOPT) $(SEEDOPT) + +cd $* && bash run-test.sh $(ABCOPT) $(SEEDOPT) >/dev/null 2>&1 +@echo "...passed tests in $*" # makefile-./ is a dummy string, not a directory .PHONY: makefile-tests +#.SILENT: $(MK_TEST_DIRS:%=%/run-test.mk) makefile-tests: $(MK_TEST_DIRS:%=makefile-./%) # this target actually emits .mk files %.mk: - +cd $(dir $*) && bash run-test.sh + +@cd $(dir $*) && bash run-test.sh # this one spawns submake on each makefile-./%: %/run-test.mk - $(MAKE) -C $* -f run-test.mk - +@echo "...passed tests in $*" + @$(MAKE) -C $* -f run-test.mk + @echo "...passed tests in $*" vanilla-test: makefile-tests abcopt-tests seed-tests @echo "" @@ -104,12 +105,12 @@ endif @echo "" clean: - rm -rf ./asicworld/*.out ./asicworld/*.log - rm -rf ./hana/*.out ./hana/*.log - rm -rf ./simple/*.out ./simple/*.log - rm -rf ./memories/*.out ./memories/*.log ./memories/*.dmp - rm -rf ./sat/*.log ./techmap/*.log ./various/*.log - rm -rf ./bram/temp ./fsm/temp ./realmath/temp ./share/temp ./smv/temp ./various/temp - rm -f ./svinterfaces/*.log_stdout ./svinterfaces/*.log_stderr ./svinterfaces/dut_result.txt ./svinterfaces/reference_result.txt ./svinterfaces/a.out ./svinterfaces/*_syn.v ./svinterfaces/*.diff - rm -f ./tools/cmp_tbdata - rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS)) + @rm -rf ./asicworld/*.out ./asicworld/*.log + @rm -rf ./hana/*.out ./hana/*.log + @rm -rf ./simple/*.out ./simple/*.log + @rm -rf ./memories/*.out ./memories/*.log ./memories/*.dmp + @rm -rf ./sat/*.log ./techmap/*.log ./various/*.log + @rm -rf ./bram/temp ./fsm/temp ./realmath/temp ./share/temp ./smv/temp ./various/temp + @rm -f ./svinterfaces/*.log_stdout ./svinterfaces/*.log_stderr ./svinterfaces/dut_result.txt ./svinterfaces/reference_result.txt ./svinterfaces/a.out ./svinterfaces/*_syn.v ./svinterfaces/*.diff + @rm -f ./tools/cmp_tbdata + @rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS)) diff --git a/tests/gen-tests-makefile.sh b/tests/gen-tests-makefile.sh index a0fb23ac3..07d70c2a8 100755 --- a/tests/gen-tests-makefile.sh +++ b/tests/gen-tests-makefile.sh @@ -17,14 +17,14 @@ generate_target() { generate_ys_test() { ys_file=$1 yosys_args_=${2:-} - generate_target "$ys_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${ys_file}.err $yosys_args_ $ys_file && mv ${ys_file}.err ${ys_file}.log" + generate_target "$ys_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${ys_file}.err $yosys_args_ $ys_file >/dev/null 2>&1 && mv ${ys_file}.err ${ys_file}.log" } # $ generate_tcl_test tcl_file [yosys_args] generate_tcl_test() { tcl_file=$1 yosys_args_=${2:-} - generate_target "$tcl_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${tcl_file}.err $yosys_args_ $tcl_file && mv ${tcl_file}.err ${tcl_file}.log" + generate_target "$tcl_file" "\"$YOSYS_BASEDIR/yosys\" -ql ${tcl_file}.err $yosys_args_ $tcl_file >/dev/null 2>&1 && mv ${tcl_file}.err ${tcl_file}.log" } # $ generate_bash_test bash_file diff --git a/tests/sim/run-test.sh b/tests/sim/run-test.sh index 43571e057..cff85eb65 100755 --- a/tests/sim/run-test.sh +++ b/tests/sim/run-test.sh @@ -6,7 +6,7 @@ find tb/* -name tb*.v | while read name; do test_name=$(basename $name .v) echo "Test $test_name" verilog_name=${test_name:3}.v - iverilog -o tb/$test_name.out $name $verilog_name - ./tb/$test_name.out -fst + iverilog -o tb/$test_name.out $name $verilog_name >/dev/null 2>&1 + ./tb/$test_name.out -fst >/dev/null 2>&1 done generate_mk --yosys-scripts --bash --yosys-args "-w 'Yosys has only limited support for tri-state logic at the moment.'"