Skip to content

W
White Rabbit Trigger Distribution
Commit ae36bb3e authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

hdl:testbench: look also for a colon when greping output in Makefile 

QuestaSim (at least version 10_5c), prints the summary after the
simulation like:
End time: 16:29:35 on Jul 26,2018, Elapsed time: 0:00:49
Errors: 1, Warnings: 9

However, the second line was recognized as a Warning and an Error.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent f80bfe1a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
hdl/testbench/Makefile
View file @ ae36bb3e
...@@ -30,13 +30,13 @@ summary: $(TB_DIRS) ...@@ -30,13 +30,13 @@ summary: $(TB_DIRS)
@for d in $(TB_DIRS); do \ @for d in $(TB_DIRS); do \
if [ -f $$d/transcript."$$d".txt ]; then \ if [ -f $$d/transcript."$$d".txt ]; then \
echo "Warnings for $$d:"; \ echo "Warnings for $$d:"; \
cat $$d/transcript."$$d".txt | grep Warning; \ cat $$d/transcript."$$d".txt | grep Warning:; \
if [ $$? -eq 1 ]; then echo "None"; fi ;\ if [ $$? -eq 1 ]; then echo "None"; fi ;\
echo "Errors for $$d:"; \ echo "Errors for $$d:"; \
cat $$d/transcript."$$d".txt | grep Error; \ cat $$d/transcript."$$d".txt | grep Error:; \
if [ $$? -eq 1 ]; then echo "None"; fi ;\ if [ $$? -eq 1 ]; then echo "None"; fi ;\
echo "Fatals for $$d:"; \ echo "Fatals for $$d:"; \
cat $$d/transcript."$$d".txt | grep Fatal; \ cat $$d/transcript."$$d".txt | grep Fatal:; \
if [ $$? -eq 1 ]; then echo "None"; fi ;\ if [ $$? -eq 1 ]; then echo "None"; fi ;\
else \ else \
echo "No transcript file for $$d"; \ echo "No transcript file for $$d"; \
...@@ -55,11 +55,11 @@ summary_total: summary summary_xml ...@@ -55,11 +55,11 @@ summary_total: summary summary_xml
for d in $(TB_DIRS); do \ for d in $(TB_DIRS); do \
if [ -f $$d/transcript."$$d".txt ]; then \ if [ -f $$d/transcript."$$d".txt ]; then \
printf "| %-50s" $$d; \ printf "| %-50s" $$d; \
printf "| %8d " `cat $$d/transcript."$$d".txt | grep Warning | wc -l`; \ printf "| %8d " `cat $$d/transcript."$$d".txt | grep Warning: | wc -l`; \
error_n=`cat $$d/transcript."$$d".txt | grep Error | wc -l`; \ error_n=`cat $$d/transcript."$$d".txt | grep Error: | wc -l`; \
printf "| %8d " $$error_n;\ printf "| %8d " $$error_n;\
if [ $$error_n -gt 0 ]; then is_error=1; fi ;\ if [ $$error_n -gt 0 ]; then is_error=1; fi ;\
fatal_n=`cat $$d/transcript."$$d".txt | grep Fatal | wc -l`; \ fatal_n=`cat $$d/transcript."$$d".txt | grep Fatal: | wc -l`; \
printf "| %8d |\n" $$fatal_n;\ printf "| %8d |\n" $$fatal_n;\
if [ $$fatal_n -gt 0 ]; then is_error=1; fi ;\ if [ $$fatal_n -gt 0 ]; then is_error=1; fi ;\
else \ else \
...@@ -79,8 +79,8 @@ summary_xml: summary ...@@ -79,8 +79,8 @@ summary_xml: summary
fatal_n=0;\ fatal_n=0;\
echo -n " <testsuite name=\""$$d"\" tests=\"1\" failures=\"" >> $(test_results_xml) ;\ echo -n " <testsuite name=\""$$d"\" tests=\"1\" failures=\"" >> $(test_results_xml) ;\
if [ -f $$d/transcript."$$d".txt ]; then \ if [ -f $$d/transcript."$$d".txt ]; then \
error_n=`cat $$d/transcript."$$d".txt | grep Error | wc -l`; \ error_n=`cat $$d/transcript."$$d".txt | grep Error: | wc -l`; \
fatal_n=`cat $$d/transcript."$$d".txt | grep Fatal | wc -l`; \ fatal_n=`cat $$d/transcript."$$d".txt | grep Fatal: | wc -l`; \
if [ $$error_n -gt 0 ] || [ $$fatal_n -gt 0 ]; then is_test_error=1; fi ;\ if [ $$error_n -gt 0 ] || [ $$fatal_n -gt 0 ]; then is_test_error=1; fi ;\
echo -n $$is_test_error >> $(test_results_xml);\ echo -n $$is_test_error >> $(test_results_xml);\
else \ else \
...@@ -92,12 +92,12 @@ summary_xml: summary ...@@ -92,12 +92,12 @@ summary_xml: summary
if [ $$is_test_error -eq 1 ]; then \ if [ $$is_test_error -eq 1 ]; then \
if [ $$error_n -gt 0 ]; then \ if [ $$error_n -gt 0 ]; then \
echo " <failure message=\"Errors\" type=\"\"><![CDATA[" >> $(test_results_xml) ;\ echo " <failure message=\"Errors\" type=\"\"><![CDATA[" >> $(test_results_xml) ;\
cat $$d/transcript."$$d".txt | grep Error >> $(test_results_xml);\ cat $$d/transcript."$$d".txt | grep Error: >> $(test_results_xml);\
echo " ]]></failure>" >> $(test_results_xml) ;\ echo " ]]></failure>" >> $(test_results_xml) ;\
fi;\ fi;\
if [ $$fatal_n -gt 0 ]; then \ if [ $$fatal_n -gt 0 ]; then \
echo " <failure message=\"Fatals\" type=\"\"><![CDATA[" >> $(test_results_xml) ;\ echo " <failure message=\"Fatals\" type=\"\"><![CDATA[" >> $(test_results_xml) ;\
cat $$d/transcript."$$d".txt | grep Fatal >> $(test_results_xml);\ cat $$d/transcript."$$d".txt | grep Fatal: >> $(test_results_xml);\
echo " ]]></failure>" >> $(test_results_xml) ;\ echo " ]]></failure>" >> $(test_results_xml) ;\
fi;\ fi;\
fi ;\ fi ;\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment