Skip to content

Commit 95cff96

Browse files
author
timlinux
committed
Better formatting for unit test outputs git-svn-id: http://svn.osgeo.org/qgis/trunk@5263 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e2d5673 commit 95cff96

File tree

1 file changed

+36
-21
lines changed

1 file changed

+36
-21
lines changed

‎tests/src/runtests.sh

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
#set -x
33
DIRS=`ls -1F | grep '/$'`
4-
OUTFILE=/tmp/qgistest.`date +%d%h%Y_%H%M`.html
4+
OUTFILE=/tmp/qgistest.`date +%d%h%Y_%Hh%M`.html
55
TOTALDIRS=0
66
TOTALEXES=0
77
TOTALFAILED=0
@@ -10,18 +10,32 @@ TOTALSKIPPED=0
1010
echo "<html>" > ${OUTFILE}
1111
echo "<head>" >> ${OUTFILE}
1212
echo "<style type="text/css">" >> ${OUTFILE}
13-
echo "body {background: #5899DB}" >> ${OUTFILE}
13+
echo "body {background: white}" >> ${OUTFILE}
14+
echo "h1 {text-align: center;}" >> ${OUTFILE}
15+
echo "h2 {text-align: center;}" >> ${OUTFILE}
16+
echo ".module {background: #FF9D4D; width: 32em;}" >> ${OUTFILE}
17+
echo ".suiteSummary {background: #F9E5D5; font-weight: bold; width: 20em; float:left;}" >> ${OUTFILE}
18+
echo ".moduleHeader {background: #EB6E08; font-size: bigger; font-weight: bold; text-align: center; width: 32em; margin-top: 1em; margin-bottom: 0em; }" >> ${OUTFILE}
19+
echo ".moduleSummary {background: #FCBA82; font-weight: bold; width: 20em; float:left;}" >> ${OUTFILE}
1420
echo ".unitSummary {background: #EFEFEF; width: 20em; float:left;}" >> ${OUTFILE}
15-
echo ".moduleSummary {background: #EFEFEF; font-weight: bold; width: 20em; float:left;}" >> ${OUTFILE}
16-
echo ".totalExes {background: #EFEFEF; width: 5em; text-align: center; float:left;}" >> ${OUTFILE}
17-
echo ".totalPasses {background: #EFEFEF; width: 5em; text-align: center; float:left;}" >> ${OUTFILE}
18-
echo ".totalFails {background: #EFEFEF; width: 5em; text-align: center; float:left;}" >> ${OUTFILE}
19-
echo ".totalSkipped {background: #EFEFEF; width: 5em; text-align: center; float:left;}" >> ${OUTFILE}
20-
echo ".{background: #EFEFEF; width: 15em;}" >> ${OUTFILE}
21+
echo ".unitSummaryFailed {background: #EFEFEF; color: crimson; width: 20em; float:left;}" >> ${OUTFILE}
22+
echo ".unitTotalExes {background: #EFEFEF; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
23+
echo ".unitTotalPasses {background: #EFEFEF; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
24+
echo ".unitTotalFails {background: #EFEFEF; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
25+
echo ".unitTotalSkipped {background: #EFEFEF; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
26+
echo ".moduleTotalExes {background: #FCBA82; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
27+
echo ".moduleTotalPasses {background: #FCBA82; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
28+
echo ".moduleTotalFails {background: #FCBA82; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
29+
echo ".moduleTotalSkipped {background: #FCBA82; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
30+
echo ".suiteTotalExes {background: #FF9946; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
31+
echo ".suiteTotalPasses {background: #FF9946; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
32+
echo ".suiteTotalFails {background: #FF9946; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
33+
echo ".suiteTotalSkipped {background: #FF9946; width: 3em; text-align: center; float:left;}" >> ${OUTFILE}
2134
echo "</style>" >> ${OUTFILE}
2235
echo "</head>" >> ${OUTFILE}
2336
echo "<body>" >> ${OUTFILE}
24-
echo "<h1>QGIS Unit Tests : `date +'%d %h %Y : %H%M'`</h1>" >> ${OUTFILE}
37+
echo "<h1>QGIS Unit Tests</h1>" >> ${OUTFILE}
38+
echo "<h2>`date +'%d %h %Y : %H%M'`</h2>" >> ${OUTFILE}
2539
for DIR in $DIRS
2640
do
2741
echo "<div class='module'>" >> ${OUTFILE}
@@ -46,10 +60,10 @@ do
4660
TOTALSKIPPED=`expr $TOTALSKIPPED + $SKIPPED`
4761
TOTALEXES=`expr $TOTALEXES + 1`
4862
echo "<div class="unitSummary">$FILE</div>" >> ${OUTFILE}
49-
echo "<div class="totalExes">&nbsp;</div>" >> ${OUTFILE}
50-
echo "<div class="totalPasses">$PASSED</div>" >> ${OUTFILE}
51-
echo "<div class="totalFails">$FAILED</div>" >> ${OUTFILE}
52-
echo "<div class="totalSkipped">$SKIPPED</div>" >> ${OUTFILE}
63+
echo "<div class="unitTotalExes">&nbsp;</div>" >> ${OUTFILE}
64+
echo "<div class="unitTotalPasses">$PASSED</div>" >> ${OUTFILE}
65+
echo "<div class="unitTotalFails">$FAILED</div>" >> ${OUTFILE}
66+
echo "<div class="unitTotalSkipped">$SKIPPED</div>" >> ${OUTFILE}
5367
echo "<br/>" >> ${OUTFILE}
5468
done
5569
TOTALDIRS=`expr $TOTALDIRS + 1`
@@ -61,10 +75,10 @@ do
6175
echo "MODULE TEST CASES FAILED : ${TOTALDIRFAILED}"
6276
echo "MODULE TEST CASES SKIPPED : ${TOTALDIRSKIPPED}"
6377
echo "<div class="moduleSummary">Totals:</div>" >> ${OUTFILE}
64-
echo "<div class="totalExes">$TOTALDIREXES</div>" >> ${OUTFILE}
65-
echo "<div class="totalPasses">$TOTALDIRPASSED</div>" >> ${OUTFILE}
66-
echo "<div class="totalFails">$TOTALDIRFAILED</div>" >> ${OUTFILE}
67-
echo "<div class="totalSkipped">$TOTALDIRSKIPPED</div>" >> ${OUTFILE}
78+
echo "<div class="moduleTotalExes">$TOTALDIREXES</div>" >> ${OUTFILE}
79+
echo "<div class="moduleTotalPasses">$TOTALDIRPASSED</div>" >> ${OUTFILE}
80+
echo "<div class="moduleTotalFails">$TOTALDIRFAILED</div>" >> ${OUTFILE}
81+
echo "<div class="moduleTotalSkipped">$TOTALDIRSKIPPED</div>" >> ${OUTFILE}
6882
echo "<br/>" >> ${OUTFILE}
6983
echo "</div><!--end of module -->" >> ${OUTFILE}
7084
done
@@ -75,11 +89,12 @@ echo "TOTAL TESTS : ${TOTALEXES}"
7589
echo "TOTAL TEST CASES PASSED : ${TOTALPASSED}"
7690
echo "TOTAL TEST CASES FAILED : ${TOTALFAILED}"
7791
echo "TOTAL TEST CASES SKIPPED : ${TOTALSKIPPED}"
92+
echo "<div class='moduleHeader'>Global Summary:</div><br/>" >> ${OUTFILE}
7893
echo "<div class="suiteSummary">Totals:</div>" >> ${OUTFILE}
79-
echo "<div class="totalExes">$TOTALEXES</div>" >> ${OUTFILE}
80-
echo "<div class="totalPasses">$TOTALPASSED</div>" >> ${OUTFILE}
81-
echo "<div class="totalFails">$TOTALFAILED</div>" >> ${OUTFILE}
82-
echo "<div class="totalSkipped">$TOTALSKIPPED</div>" >> ${OUTFILE}
94+
echo "<div class="suiteTotalExes">$TOTALEXES</div>" >> ${OUTFILE}
95+
echo "<div class="suiteTotalPasses">$TOTALPASSED</div>" >> ${OUTFILE}
96+
echo "<div class="suiteTotalFails">$TOTALFAILED</div>" >> ${OUTFILE}
97+
echo "<div class="suiteTotalSkipped">$TOTALSKIPPED</div>" >> ${OUTFILE}
8398
echo "<br/>" >> ${OUTFILE}
8499
echo "</body>" >> ${OUTFILE}
85100
echo "</html>" >> ${OUTFILE}

0 commit comments

Comments
 (0)