<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems-testing (2011-01-26)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-01-26 Joel Sherrill <joel.sherrilL@OARcorp.com>
* do_coverage, generate_coverage_html, run_coverage: Contents of
coverage data is now split into a collection of BSP specific
directories. There were over 2000 entries in the main directory of
the site before doing this. Also reworked the timeplot page to
include the legend before each graph.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/rtems-coverage/ChangeLog.diff?r1=text&tr1=1.297&r2=text&tr2=1.298&diff_format=h">M</a></td><td width='1%'>1.298</td><td width='100%'>rtems-coverage/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/rtems-coverage/do_coverage.diff?r1=text&tr1=1.72&r2=text&tr2=1.73&diff_format=h">M</a></td><td width='1%'>1.73</td><td width='100%'>rtems-coverage/do_coverage</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/rtems-coverage/generate_coverage_html.diff?r1=text&tr1=1.28&r2=text&tr2=1.29&diff_format=h">M</a></td><td width='1%'>1.29</td><td width='100%'>rtems-coverage/generate_coverage_html</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-testing/rtems-coverage/run_coverage.diff?r1=text&tr1=1.13&r2=text&tr2=1.14&diff_format=h">M</a></td><td width='1%'>1.14</td><td width='100%'>rtems-coverage/run_coverage</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-testing/rtems-coverage/ChangeLog:1.297 rtems-testing/rtems-coverage/ChangeLog:1.298
--- rtems-testing/rtems-coverage/ChangeLog:1.297 Fri Jan 21 12:52:35 2011
+++ rtems-testing/rtems-coverage/ChangeLog Wed Jan 26 12:25:59 2011
</font><font color='#997700'>@@ -1,3 +1,11 @@
</font><font color='#000088'>+2011-01-26 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * do_coverage, generate_coverage_html, run_coverage: Contents of
+ coverage data is now split into a collection of BSP specific
+ directories. There were over 2000 entries in the main directory of
+ the site before doing this. Also reworked the timeplot page to
+ include the legend before each graph.
+
</font> 2011-01-21 Joel Sherrill <joel.sherrilL@OARcorp.com>
* run_coverage: Parse command arguments better.
<font color='#006600'>diff -u rtems-testing/rtems-coverage/do_coverage:1.72 rtems-testing/rtems-coverage/do_coverage:1.73
--- rtems-testing/rtems-coverage/do_coverage:1.72 Wed Aug 4 08:35:20 2010
+++ rtems-testing/rtems-coverage/do_coverage Wed Jan 26 12:25:59 2011
</font><font color='#997700'>@@ -724,7 +724,7 @@
</font> results_dir=${outputDir}
fi
<font color='#880000'>- generate_symbols | remove_unwanted_symbols \
</font><font color='#000088'>+ generate_symbols | sort -u | remove_unwanted_symbols \
</font> >${BASEDIR}/${BSP}-tests/rtems.syms
syms=`cat ${BASEDIR}/${BSP}-tests/rtems.syms | wc -l`
if [ ${syms} -eq 0 ] ; then
<font color='#006600'>diff -u rtems-testing/rtems-coverage/generate_coverage_html:1.28 rtems-testing/rtems-coverage/generate_coverage_html:1.29
--- rtems-testing/rtems-coverage/generate_coverage_html:1.28 Wed Jan 5 15:21:35 2011
+++ rtems-testing/rtems-coverage/generate_coverage_html Wed Jan 26 12:26:00 2011
</font><font color='#997700'>@@ -110,9 +110,9 @@
</font> EOF
for bsp in $BSPs
do
<font color='#880000'>- cpu=`grep "^Target" ${bsp}-*/configuration.txt | \
</font><font color='#000088'>+ cpu=`grep "^Target" ${bsp}/${bsp}-*/configuration.txt | \
</font> sed -e 's/^.*Target: *//' | cut -d'-' -f1 | sort -u`
<font color='#880000'>- echo "<li><a href=\"${bsp}.html\">${cpu}/${bsp}</li>"
</font><font color='#000088'>+ echo "<li><a href=\"${bsp}/${bsp}.html\">${cpu}/${bsp}</li>"
</font> done
cat <<EOF
</ul>
<font color='#997700'>@@ -314,33 +314,14 @@
</font> print_doc_bottom
}
<font color='#880000'>-cd $1
-
-if [ `ls -1 *.tar.bz2 2>/dev/null | wc -l` -eq 0 ]; then
- echo "No tarballs. Is $1 really a coverage publishing directory?"
- exit 1
-fi
-
-for d in `ls -1 *.tar.bz2 | sed -e 's/.tar.bz2$//'`
-do
- if [ ! -d ${d} ] ; then
- tar xjf ${d}.tar.bz2
- fi
-done
-
-if [ ! -d rtems ] ; then
- mkdir rtems
-fi
-
-cp ${COVBASE}/style.css rtems/style.css
-
</font> genBSPList()
{
<font color='#880000'>- find * -maxdepth 1 -type d | cut -d'-' -f1 | uniq | \
- sed -e '/rtems/d' -e '/plot_data/d' -e '/graphs/d' | \
- while read bsp
</font><font color='#000088'>+ find * -type d -name "*-O[s2][pP][dD]-2???[012]???-????" | \
+ cut -d'-' -f1 | uniq | \
+ while read dir
</font> do
<font color='#880000'>- cpu=`grep ^Target ${bsp}-*/configuration.txt | tail -1 | \
</font><font color='#000088'>+ bsp=`echo ${dir} | sed -e 's/.*\/.*-//'`
+ cpu=`grep ^Target ${dir}-*/configuration.txt | tail -1 | \
</font> sed -e 's/^.*://' -e 's/^.*: *\([a-z]*\)-rtems.*$/\1/'`
echo ${cpu}/${bsp}
done | sort -t / -k 1 -k 2 | cut -d'/' -f2
<font color='#997700'>@@ -385,7 +366,7 @@
</font> gen_plot()
{
# Now merge the data
<font color='#880000'>- datfiles=`ls -1 ${OUT}/${bsp}-*${DEV}-${FIELD}.dat`
</font><font color='#000088'>+ datfiles=`ls -1 ${OUTDAT}/${bsp}-*${DEV}-${FIELD}.dat`
</font> first=`cat ${datfiles} | sort -t' ' -k1.3 -n | head -n 1 | cut -d' ' -f1`
last=`cat ${datfiles} | sort -t' ' -k1.3 -n | tail -n 1 | cut -d' ' -f1`
<font color='#997700'>@@ -469,19 +450,19 @@
</font> echo "set title \"${TITLE}\""
echo "set key left box"
<font color='#880000'>- echo "plot \"${OUT}/${bsp}-Osp${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font><font color='#000088'>+ echo "plot \"${OUTDAT}/${bsp}-Osp${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font> echo " title \"Osp${DEV}\" with lines lw 2, \\"
<font color='#880000'>- echo " \"${OUT}/${bsp}-OsP${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font><font color='#000088'>+ echo " \"${OUTDAT}/${bsp}-OsP${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font> echo " title \"OsP${DEV}\" with lines lw 2, \\"
<font color='#880000'>- echo " \"${OUT}/${bsp}-O2p${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font><font color='#000088'>+ echo " \"${OUTDAT}/${bsp}-O2p${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font> echo " title \"O2p${DEV}\" with lines lw 2, \\"
<font color='#880000'>- echo " \"${OUT}/${bsp}-O2P${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font><font color='#000088'>+ echo " \"${OUTDAT}/${bsp}-O2P${DEV}-${FIELD}.dat\" using 1:2 index 0 \\"
</font> echo " title \"O2P${DEV}\" with lines lw 2"
}
gen_data()
{
<font color='#880000'>- for s in `ls -1 ${bsp}-${CONF}-*/summary.txt | sort `
</font><font color='#000088'>+ for s in `ls -1 ${bsp}/${bsp}-${CONF}-*/summary.txt | sort `
</font> do
timestamp=`echo $s | cut -d'-' -f3-4 | cut -d'/' -f1`
case ${FIELD} in
<font color='#997700'>@@ -507,6 +488,20 @@
</font> {
BSP=$1
<font color='#000088'>+LEGEND_TABLE_BODY="\
+<table>\
+<tr>\
+ <td style="color:#ff0000">O2pd</td>\
+ <td style="color:#D0A825">O2pD</td>\
+ <td style="color:#336699">O2Pd</td>\
+ <td style="color:#99FF00">O2PD</td>\
+ <td style="color:#336666">Ospd</td>\
+ <td style="color:#33CC33">OspD</td>\
+ <td style="color:#990099">OsPd</td>\
+ <td style="color:#ff0099">OsPD</td>\
+</tr>\
+</table>"
+
</font> cat <<EOF
<HTML>
<HEAD>
<font color='#997700'>@@ -578,67 +573,92 @@
</font> </script>
</head>
<body onload="onLoad();" onresize="onResize();">
<font color='#000088'>+ <h1>${BSP} Timeplot Graphs</h1>
</font> <li><a href="#uncovered_percent">Uncovered Percentage Graph</a></li>
<li><a href="#total_bytes">Total Bytes Analyzed Graph</a></li>
<li><a href="#ranges">Uncovered Ranges Graph</a></li>
<li><a href="#uncovered_bytes">Uncovered Bytes Graph</a></li>
<font color='#880000'>- <ul id="legend">
- <li style="color:#ff0000">O2pd</li>
- <li style="color:#D0A825">O2pD</li>
- <li style="color:#336699">O2Pd</li>
- <li style="color:#99FF00">O2PD</li>
- <li style="color:#336666">Ospd</li>
- <li style="color:#33CC33">OspD</li>
- <li style="color:#990099">OsPd</li>
- <li style="color:#ff0099">OsPD</li>
- </ul>
-
-
</font> <h2 id="uncovered_percent">Uncovered Percentage</h2>
<font color='#880000'>- <a href="#legend">Legend</a>
</font><font color='#000088'>+ ${LEGEND_TABLE_BODY}
</font> <div id="uncovered_percent-timeplot" style="height: 500px;"></div>
<font color='#000088'>+
</font> <h2 id="total_bytes">Total Bytes Analyzed</h2>
<font color='#880000'>- <a href="#legend">Legend</a>
</font><font color='#000088'>+ ${LEGEND_TABLE_BODY}
</font> <div id="total_bytes-timeplot" style="height: 500px;"></div>
<h2 id="ranges">Uncovered Ranges</h2>
<font color='#880000'>- <a href="#legend">Legend</a>
</font><font color='#000088'>+
+ ${LEGEND_TABLE_BODY}
</font> <div id="ranges-timeplot" style="height: 500px;"></div>
<font color='#000088'>+
</font> <h2 id="uncovered_bytes">Uncovered bytes</h2>
<font color='#880000'>- <a href="#legend">Legend</a>
</font><font color='#000088'>+ ${LEGEND_TABLE_BODY}
</font> <div id="uncovered_bytes-timeplot" style="height: 500px;"></div>
</body>
</html>
EOF
}
<font color='#000088'>+#
+# Now start the non-method code
+#
+
+cd $1
+
+good_dir="no"
+for d in `ls -1 *.tar.bz2 */*.tar.bz2 2>/dev/null | sed -e 's/.tar.bz2$//'`
+do
+ good_dir="yes"
+ if [ ! -d ${d} ] ; then
+ tar xjf ${d}.tar.bz2
+ fi
+done
+
+if [ ${good_dir} = "no" ]; then
+ echo "No tarballs. Is $1 really a coverage publishing directory?"
+ exit 1
+fi
+
+# Put the style sheets in place
+if [ ! -d rtems ] ; then
+ mkdir rtems
+fi
+cp ${COVBASE}/style.css rtems/style.css
+
+# Find the BSPs and make their directories
+echo "Generating BSP list"
</font> #BSPs=`find * -maxdepth 1 -type d | cut -d'-' -f1 | uniq | grep -v rtems`
BSPs=`genBSPList`
<font color='#000088'>+echo BSPs=${BSPs}
</font>
<font color='#000088'>+echo "Ensuring BSP specific content is in BSP subdirectory"
+for bsp in ${BSPs}<span style="background-color: #FF0000"> </span>
+do
+ test -d ${bsp} || mkdir ${bsp}
+ test -d ${bsp}/rtems || mkdir ${bsp}/rtems
+ test -d ${bsp}/plot_data || mkdir ${bsp}/plot_data
+ test -d ${bsp}/graphs || mkdir ${bsp}/graphs
+ cp ${COVBASE}/style.css ${bsp}/rtems/style.css
+ mv ${bsp}-* ${bsp} 2>/dev/null
+done
</font>
# Let them grow for a while
# cleanup
<font color='#000088'>+echo "Generating master index.html"
</font> print_index >index.html
<font color='#880000'>-# now generate a page per BSP
</font><font color='#000088'>+# now generate a page per BSP with plots and graphs
+
</font> for bsp in ${BSPs}
do
echo "Generating BSP Page for ${bsp}..."
<font color='#000088'>+ cd $1/${bsp}
</font> do_perBSPPage ${bsp} >${bsp}.html
<font color='#880000'>-done
-
-# Now generate the plots
-cd $1
</font>
<font color='#880000'>-OUTFIG=graphs
-OUT=plot_data
-rm -rf ${OUT}
-test -d ${OUT} || mkdir ${OUT}
-test -d ${OUTFIG} || mkdir ${OUTFIG}
-
-for bsp in ${BSPs}
-do
</font><font color='#000088'>+ cd $1
+ OUTFIG=${bsp}/graphs
+ OUTDAT=${bsp}/plot_data
</font> echo "Generating Static Plots for ${bsp}..."
for FIELD in ranges total_bytes uncovered_bytes \
uncovered_percent #covered_percent
<font color='#997700'>@@ -657,12 +677,11 @@
</font> do
for CONF in Osp${DEV} OsP${DEV} O2p${DEV} O2P${DEV}
do
<font color='#880000'>- gen_data ${bsp} ${CONF} >${OUT}/${bsp}-${CONF}-${FIELD}.dat
</font><font color='#000088'>+ gen_data ${bsp} ${CONF} >${OUTDAT}/${bsp}-${CONF}-${FIELD}.dat
</font> done
<font color='#880000'>- pltfile=${OUT}/${bsp}-${FIELD}-${DEV}.plt
</font><font color='#000088'>+ pltfile=${OUTDAT}/${bsp}-${FIELD}-${DEV}.plt
</font> gen_plot >${pltfile}
<font color='#880000'>- #echo gnuplot ${pltfile}
</font> gnuplot ${pltfile}
done
<font color='#006600'>diff -u rtems-testing/rtems-coverage/run_coverage:1.13 rtems-testing/rtems-coverage/run_coverage:1.14
--- rtems-testing/rtems-coverage/run_coverage:1.13 Fri Jan 21 12:52:35 2011
+++ rtems-testing/rtems-coverage/run_coverage Wed Jan 26 12:26:00 2011
</font><font color='#997700'>@@ -180,11 +180,11 @@
</font> ;;
*_baseline)<span style="background-color: #FF0000"> </span>
bsp=`echo $cmd | sed -e 's/_baseline$//'`
<font color='#880000'>- # XXX development off?
- do_one ${bsp} -S # -Os / POSIX enabled / regression
- do_one ${bsp} -S -P # -Os / POSIX disabled / regression
- do_one ${bsp} # -O2 / POSIX enabled / regression
- do_one ${bsp} -P # -O2 / POSIX disabled / regression
</font><font color='#000088'>+ # Each run does both developmental and core. So this is 8 configurations
+ do_one ${bsp} -S # -Os / POSIX enabled
+ do_one ${bsp} -S -P # -Os / POSIX disabled
+ do_one ${bsp} # -O2 / POSIX enabled
+ do_one ${bsp} -P # -O2 / POSIX disabled
</font> ;;
*)
echo "Unknown command (${cmd})"
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>