Merge pull request #33 from SergeyDegtyar/master

Fix tests for misc/scc_feedback

misc/Makefile

@@ -44,7 +44,7 @@ $(eval $(call template,show, show show_colorattr show_colors show_color show_enu
 
 #scc
 $(eval $(call template,scc, scc scc_all_cell_types scc_expect scc_max_depth scc_nofeedback scc_select scc_set_attr ))
-$(eval $(call template,scc_feedback, scc scc_all_cell_types scc_expect scc_max_depth scc_nofeedback scc_select scc_set_attr ))
+$(eval $(call template,scc_feedback, scc scc_all_cell_types scc_expect1 scc_max_depth scc_nofeedback scc_select scc_set_attr ))
 $(eval $(call template,scc_hier_feedback, scc scc_all_cell_types scc_expect scc_max_depth scc_nofeedback scc_select scc_set_attr ))
 
 

misc/run.sh

@@ -140,6 +140,9 @@ elif [ "$2" = "scatter" ]; then
 elif [ "$1" = "scc" ] || \
 	 [ "$1" = "scc_hier_feedback" ]; then
 	expected_string="0 SCCs"
+	if [ "$1" = "scc_hier_feedback" ] && [ "$2" = "scc_all_cell_types" ]; then
+		expected="0"
+	fi
 elif [ "$1" = "scc_feedback" ]; then
 	expected_string="0 SCCs"
 	expected="0"

misc/scripts/scc_expect1.ys

+read_verilog ../top.v
+proc
+tee -o result.log scc -expect 1 top