tests: avoid interleaving lines in test output

Author: widlarizer

Makefile

@@ -955,7 +955,7 @@ makefile-tests: $(MK_TEST_DIRS:%=makefile-tests/%)
 	+cd $(dir $*) && bash run-test.sh
 # this one spawns submake on each
 makefile-tests/%: %/run-test.mk $(TARGETS) $(EXTRA_TARGETS)
-	$(MAKE) -C $* -f run-test.mk
+	stdbuf -oL -eL $(MAKE) -C $* -f run-test.mk
 	+@echo "...passed tests in $*"
 
 test: makefile-tests abcopt-tests seed-tests

techlibs/xilinx/tests/bram1.sh

@@ -43,7 +43,7 @@ for dbits in $dbits_list; do
 	{
 		echo "bram1_$id/ok:"
 		echo "	@cd bram1_$id && bash run.sh"
-		echo "	@echo -n '[$id]'"
+		echo "	@echo '[$id]'"
 		echo "	@touch \$@"
 	} >> bram1.mk
 	all_list="$all_list bram1_$id/ok"

tests/arch/run-test.sh

@@ -10,20 +10,20 @@ for arch in ../../techlibs/*; do
 		arch_name=$(basename -- $arch)
 		if [ "${defines[$arch_name]}" ]; then
 			for def in ${defines[$arch_name]}; do
-				echo -n "Test $path -D$def ->"
+				echo "Test $path -D$def ->"
 				iverilog -t null -I$arch -D$def -DNO_ICE40_DEFAULT_ASSIGNMENTS $path
 				echo " ok"
 			done
 		else
-			echo -n "Test $path ->"
+			echo "Test $path ->"
 			iverilog -t null -I$arch -g2005-sv $path
 			echo " ok"
 		fi
 	done
 done
 
 for path in "../../techlibs/common/simcells.v"  "../../techlibs/common/simlib.v"; do
-	echo -n "Test $path ->"
+	echo "Test $path ->"
 	iverilog -t null $path
 	echo " ok"
 done

tests/fsm/run-test.sh

@@ -29,10 +29,9 @@ python3 generate.py -c $count $seed
 	for i in $( ls temp/*.ys | sed 's,[^0-9],,g; s,^0*\(.\),\1,g;' ); do
 		idx=$( printf "%05d" $i )
 		echo "temp/uut_${idx}.log: temp/uut_${idx}.ys temp/uut_${idx}.v"
-		echo "	@echo -n '[$i]'"
 		echo "	@../../yosys -ql temp/uut_${idx}.out temp/uut_${idx}.ys"
 		echo "	@mv temp/uut_${idx}.out temp/uut_${idx}.log"
-		echo "	@grep -q 'SAT proof finished' temp/uut_${idx}.log && echo -n K || echo -n T"
+		echo "	@grep -q 'SAT proof finished' temp/uut_${idx}.log && echo K || echo T"
 		all_targets="$all_targets temp/uut_${idx}.log"
 	done
 	echo "$all_targets"

tests/gen-tests-makefile.sh

@@ -9,8 +9,7 @@ generate_target() {
 	echo "all: $target_name"
 	echo ".PHONY: $target_name"
 	echo "$target_name:"
-	printf "\t@%s\n" "$test_command"
-	printf "\t@echo 'Passed %s'\n" "$target_name"
+	printf "\t@/usr/bin/env time -f \"Test $target_name took %%e\" $test_command >/dev/null 2>/dev/null\n"
 }
 
 # $ generate_ys_test ys_file [yosys_args]

tests/memories/run-test.sh

@@ -17,7 +17,7 @@ shift "$((OPTIND-1))"
 ${MAKE:-make} -f ../tools/autotest.mk SEED="$seed" EXTRA_FLAGS="$abcopt" *.v
 
 for f in `egrep -l 'expect-(wr-ports|rd-ports|rd-clk)' *.v`; do
-	echo -n "Testing expectations for $f .."
+	echo "Testing expectations for $f .."
 	../../yosys -f verilog -qp "proc; opt; memory -nomap;; dump -outfile ${f%.v}.dmp t:\$mem_v2" $f
 	if grep -q expect-wr-ports $f; then
 		grep -q "parameter \\\\WR_PORTS $(gawk '/expect-wr-ports/ { print $3; }' $f)\$" ${f%.v}.dmp ||

tests/opt_share/run-test.sh

@@ -32,7 +32,6 @@ python3 generate.py -c $count $seed
 		echo "all: test-$idx"
 		echo "test-$idx:"
 		printf "\t@%s\n" \
-			"echo -n [$i]" \
 			"../../yosys -ql temp/uut_${idx}.log temp/uut_${idx}.ys"
 	done
 } > temp/makefile

tests/realmath/run-test.sh

@@ -21,7 +21,6 @@ python3 generate.py -c $count $seed
 cd temp
 echo "running tests.."
 for ((i = 0; i < $count; i++)); do
-	echo -n "[$i]"
 	idx=$( printf "%05d" $i )
 	../../../yosys -qq uut_${idx}.ys
 	iverilog -o uut_${idx}_tb uut_${idx}_tb.v uut_${idx}.v uut_${idx}_syn.v

tests/share/run-test.sh

@@ -24,7 +24,6 @@ python3 generate.py -c $count $seed
 
 echo "running tests.."
 for i in $( ls temp/*.ys | sed 's,[^0-9],,g; s,^0*\(.\),\1,g;' ); do
-	echo -n "[$i]"
 	idx=$( printf "%05d" $i )
 	../../yosys -ql temp/uut_${idx}.log temp/uut_${idx}.ys
 done

tests/svinterfaces/run_simple.sh

@@ -7,7 +7,7 @@ if [ $# != 1 ]; then
     exit 1
 fi
 
-echo -n "Test: $1 ->"
+echo "Test: $1 ->"
 ../../yosys $1.ys >$1.log_stdout 2>$1.log_stderr || {
     echo "ERROR!"
     exit 1