2010-10-14 Joel Sherrill <joel.sherrilL@OARcorp.com>

	* generate_coverage_html: Add uncovered ranges.

2 files changed, 28 insertions, 9 deletions

diff --git a/rtems-coverage/ChangeLog b/rtems-coverage/ChangeLog
index e290571..422fc64 100644
--- a/rtems-coverage/ChangeLog
+++ b/rtems-coverage/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-14	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
+	* generate_coverage_html: Add uncovered ranges.
+
+2010-10-14	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
 	* generate_coverage_html: Add progress tracking time/series plots.
 
 2010-08-26	Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/rtems-coverage/generate_coverage_html b/rtems-coverage/generate_coverage_html
index 9317c19..3a6ebcb 100755
--- a/rtems-coverage/generate_coverage_html
+++ b/rtems-coverage/generate_coverage_html
@@ -196,18 +196,17 @@ echo "<li><a href=\"graphs/${BSP}-uncovered_percent-d.png\">"
 echo "  Uncovered Percentage (Core)</a></li>"
 echo "<li><a href=\"graphs/${BSP}-uncovered_percent-D.png\">"
 echo "  Uncovered Percentage (Developmental)</a></li>"
-echo "<li><a href=\"graphs/${BSP}-uncovered_bytes-d.png\">"
-echo "  Uncovered Bytes (Core)</a></li>"
 
-echo "<li><a href=\"graphs/${BSP}-total_bytes-D.png\">"
-echo "  Total Bytes Analyzed (Developmental)</a></li>"
 echo "<li><a href=\"graphs/${BSP}-total_bytes-d.png\">"
 echo "  Total Bytes Analyzed (Core)</a></li>"
 echo "<li><a href=\"graphs/${BSP}-total_bytes-D.png\">"
 echo "  Total Bytes Analyzed (Developmental)</a></li>"
 
-echo "<li><a href=\"graphs/${BSP}-uncovered_bytes-D.png\">"
-echo "  Uncovered Bytes (Developmental)</a></li>"
+echo "<li><a href=\"graphs/${BSP}-ranges-d.png\">"
+echo "  Uncovered Ranges (Core)</a></li>"
+echo "<li><a href=\"graphs/${BSP}-ranges-D.png\">"
+echo "  Uncovered Ranges (Developmental)</a></li>"
+
 echo "<li><a href=\"graphs/${BSP}-uncovered_bytes-d.png\">"
 echo "  Uncovered Bytes (Core)</a></li>"
 echo "<li><a href=\"graphs/${BSP}-uncovered_bytes-D.png\">"
@@ -350,6 +349,12 @@ gen_plot()
   max=`cat ${datfiles} | sort -k2 -n | tail -n 1 | cut -d' ' -f2`
   round=
   case ${FIELD} in
+    ranges)
+      round=10
+      min=`round_down ${min} 10 0`
+      max=`round_up   ${max} 10 1000000`
+      YLABEL=Ranges
+      ;;
     covered_percent)
       max=100.0
       YLABEL=Covered
@@ -415,7 +420,7 @@ gen_plot()
   echo "set xrange [\""${start}"\":\""${end}"\"]"
   echo "set yrange [${min}:${max}]"
   echo "set grid"
-  echo "set xlabel \"Date\\nTime\""
+  echo "set xlabel \"Date\""
   echo "set ylabel \"${YLABEL}\""
   echo "set title \"${TITLE}\""
   echo "set key left box"
@@ -435,7 +440,15 @@ gen_data()
   for s in `ls -1 ${bsp}-${CONF}-*/summary.txt | sort `
   do
     timestamp=`echo $s | cut -d'-' -f3-4 | cut -d'/' -f1`
-    num=`grep "${PATTERN}" $s | cut -d':' -f2`
+    case ${FIELD} in
+      ranges)
+        num=`grep "${PATTERN}" $s | cut -d' ' -f1`
+        if [ "X${num}" = "X" ] ; then
+          num=`grep -i "${PATTERN}" $s | cut -d':' -f2`
+        fi
+        ;;
+      *)      num=`grep "${PATTERN}" $s | cut -d':' -f2` ;;
+    esac
 
     Year=`echo ${timestamp} | cut -c1-4`
     Month=`echo ${timestamp} | cut -c5-6`
@@ -474,10 +487,12 @@ test -d ${OUTFIG} || mkdir ${OUTFIG}
 
 for bsp in ${BSPs}
 do
-  for FIELD in total_bytes uncovered_bytes uncovered_percent #covered_percent 
+  for FIELD in ranges total_bytes uncovered_bytes \
+    uncovered_percent #covered_percent 
   do
     # Pattern to find in summary.txt
     case ${FIELD} in
+      ranges)            PATTERN="Uncovered Ranges Found" ;;
       covered_percent)   PATTERN="Percentage Executed" ;;
       uncovered_percent) PATTERN="Percentage Not Executed" ;;
       total_bytes)       PATTERN="Bytes Analyzed" ;;