<!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 gcc-testing (2010-05-11)</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>2010-05-11 Joel Sherrill <joel.sherrilL@OARcorp.com>
* DesiredSymbols.cc: Remove range1.tmp and ranges2.tmp.
* ReportsBase.cc, app_common.cc, covoar.cc, do_coverage: Generate
files into user specified output directory.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ChangeLog.diff?r1=text&tr1=1.215&r2=text&tr2=1.216&diff_format=h">M</a></td><td width='1%'>1.216</td><td width='100%'>rtems-coverage/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/DesiredSymbols.cc.diff?r1=text&tr1=1.6&r2=text&tr2=1.7&diff_format=h">M</a></td><td width='1%'>1.7</td><td width='100%'>rtems-coverage/DesiredSymbols.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsBase.cc.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>rtems-coverage/ReportsBase.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/app_common.cc.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>rtems-coverage/app_common.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/covoar.cc.diff?r1=text&tr1=1.15&r2=text&tr2=1.16&diff_format=h">M</a></td><td width='1%'>1.16</td><td width='100%'>rtems-coverage/covoar.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/do_coverage.diff?r1=text&tr1=1.53&r2=text&tr2=1.54&diff_format=h">M</a></td><td width='1%'>1.54</td><td width='100%'>rtems-coverage/do_coverage</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.215 gcc-testing/rtems-coverage/ChangeLog:1.216
--- gcc-testing/rtems-coverage/ChangeLog:1.215 Mon May 10 17:11:52 2010
+++ gcc-testing/rtems-coverage/ChangeLog Tue May 11 13:17:33 2010
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2010-05-11 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * DesiredSymbols.cc: Remove range1.tmp and ranges2.tmp.
+ * ReportsBase.cc, app_common.cc, covoar.cc, do_coverage: Generate
+ files into user specified output directory.
+
</font> 2010-05-10 Joel Sherrill <joel.sherrilL@OARcorp.com>
* generate_coverage_html: Individual tables per configuration. List of
<font color='#006600'>diff -u gcc-testing/rtems-coverage/DesiredSymbols.cc:1.6 gcc-testing/rtems-coverage/DesiredSymbols.cc:1.7
--- gcc-testing/rtems-coverage/DesiredSymbols.cc:1.6 Fri May 7 13:53:58 2010
+++ gcc-testing/rtems-coverage/DesiredSymbols.cc Tue May 11 13:17:33 2010
</font><font color='#997700'>@@ -439,6 +439,8 @@
</font> }
fclose( tmpfile );
<font color='#000088'>+ unlink( "ranges1.tmp" );
+ unlink( "ranges2.tmp" );
</font> }
SymbolInformation* DesiredSymbols::find(
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.cc:1.4 gcc-testing/rtems-coverage/ReportsBase.cc:1.5
--- gcc-testing/rtems-coverage/ReportsBase.cc:1.4 Mon May 10 13:10:16 2010
+++ gcc-testing/rtems-coverage/ReportsBase.cc Tue May 11 13:17:33 2010
</font><font color='#997700'>@@ -4,6 +4,9 @@
</font>
#include <stdio.h>
#include <string.h>
<font color='#000088'>+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
</font>
#include "ReportsBase.h"
#include "app_common.h"
<font color='#997700'>@@ -12,7 +15,6 @@
</font> #include "Explanations.h"
#include "ObjdumpProcessor.h"
<font color='#880000'>-
</font> #include "ReportsText.h"
#include "ReportsHtml.h"
<font color='#997700'>@@ -32,14 +34,25 @@
</font> const char* const fileName
)
{
<font color='#880000'>- FILE* aFile;
</font><font color='#000088'>+ int sc;
+ FILE *aFile;
+ std::string file;
+
+ // Create the output directory if it does not already exist
+ sc = mkdir( outputDirectory,0755 );
+ if ( (sc == -1) && (errno != EEXIST) ) {
+ fprintf(stderr, "Unable to create output directory %s\n", outputDirectory);
+ return NULL;
+ }
+
+ file = outputDirectory;
+ file += "/";
+ file += fileName;
</font>
// Open the file.
<font color='#880000'>- aFile = fopen( fileName, "w" );
</font><font color='#000088'>+ aFile = fopen( file.c_str(), "w" );
</font> if ( !aFile ) {
<font color='#880000'>- fprintf(
- stderr, "Unable to open %s\n", fileName
- );
</font><font color='#000088'>+ fprintf( stderr, "Unable to open %s\n", file.c_str() );
</font> }
return aFile;
}
<font color='#006600'>diff -u gcc-testing/rtems-coverage/app_common.cc:1.2 gcc-testing/rtems-coverage/app_common.cc:1.3
--- gcc-testing/rtems-coverage/app_common.cc:1.2 Thu Apr 22 14:14:07 2010
+++ gcc-testing/rtems-coverage/app_common.cc Tue May 11 13:17:33 2010
</font><font color='#997700'>@@ -22,7 +22,7 @@
</font> Coverage::DesiredSymbols* SymbolsToAnalyze = NULL;
Coverage::Toolnames* Tools = NULL;
bool Verbose = false;
<font color='#880000'>-
</font><font color='#000088'>+const char* outputDirectory = ".";
</font>
bool FileIsNewer( const char *f1, const char *f2 ) {
struct stat buf1, buf2;
<font color='#997700'>@@ -45,7 +45,7 @@
</font> size_t len = strlen( line );
do {<span style="background-color: #FF0000"> </span>
<font color='#880000'>- if (! fgets( discardBuff, 99, file ) )
</font><font color='#000088'>+ if ( !fgets( discardBuff, 99, file ) )
</font> return false;
if ( strncmp( discardBuff, line, len ) == 0 )<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/covoar.cc:1.15 gcc-testing/rtems-coverage/covoar.cc:1.16
--- gcc-testing/rtems-coverage/covoar.cc:1.15 Mon May 10 14:31:11 2010
+++ gcc-testing/rtems-coverage/covoar.cc Tue May 11 13:17:33 2010
</font><font color='#997700'>@@ -43,7 +43,6 @@
</font> const char* symbolsFile = NULL;
const char* target = NULL;
const char* format = NULL;
<font color='#880000'>-const char* outputDirectory = ".";
</font>
/*
* Print program usage message
<font color='#997700'>@@ -369,11 +368,15 @@
</font>
// Write explanations that were not found.
if ( explanations ) {
<font color='#880000'>- std::string str = explanations;
- str = str + ".NotFound";
</font><font color='#000088'>+ std::string notFound;
+
+ notFound = outputDirectory;
+ notFound += "/";
+ notFound += "ExplanationsNotFound.txt";
+
</font> if (Verbose)
<font color='#880000'>- fprintf( stderr, "Writing Not Found Report (%s)\n", str.c_str() );
- AllExplanations->writeNotFound(str.c_str());
</font><font color='#000088'>+ fprintf( stderr, "Writing Not Found Report (%s)\n", notFound.c_str() );
+ AllExplanations->writeNotFound( notFound.c_str() );
</font> }
// Calculate coverage statistics and output results.
<font color='#006600'>diff -u gcc-testing/rtems-coverage/do_coverage:1.53 gcc-testing/rtems-coverage/do_coverage:1.54
--- gcc-testing/rtems-coverage/do_coverage:1.53 Mon May 10 14:37:27 2010
+++ gcc-testing/rtems-coverage/do_coverage Tue May 11 13:17:33 2010
</font><font color='#997700'>@@ -203,10 +203,13 @@
</font> {
echo "BSP: " ${BSP}
echo "Target: " ${TARGET}
<font color='#000088'>+ echo "Compiler version: " `${TARGET}-gcc --version | grep gcc`
+ echo "do_optimize_size: " ${do_optimize_size}
+ echo "Optimization Level: " ${c_opt}
+ echo "POSIX Enabled: " ${do_posix}
+ echo "Developmental Code: " ${do_developmental}
</font> echo "do_all: " ${do_all}
echo "do_covmerge " ${do_covmerge}
<font color='#880000'>- echo "do_posix: " ${do_posix}
- echo "do_optimize_size: " ${do_optimize_size}
</font> echo "do_rtems_update: " ${do_rtems_update}
echo "do_rtems_configure: " ${do_rtems_configure}
echo "do_rtems_build: " ${do_rtems_build}
<font color='#997700'>@@ -217,11 +220,16 @@
</font> echo "do_publish: " ${do_publish}
echo "do_save_tarballs: " ${do_save_tarballs}
echo "Clean Before: " ${do_clean}
<font color='#880000'>- echo "Executable Extension " ${RTEMSEXT}
- echo "Coverage Extension " ${COVEXT}
-
</font><font color='#000088'>+ echo "Executable Extension: " ${RTEMSEXT}
+ echo "Coverage Extension: " ${COVEXT}
</font> }
<font color='#000088'>+if [ ${do_optimize_size} = yes ] ; then
+ c_opt=-Os
+else
+ c_opt=-O2
+fi
+
</font> if [ ${verbose} = "yes" ] ; then
print_verbose
fi
<font color='#997700'>@@ -265,12 +273,6 @@
</font> exit 1
fi
<font color='#880000'>-if [ ${do_optimize_size} = yes ] ; then
- c_opt=-Os
-else
- c_opt=-O2
-fi
-
</font> EXTENSION=${c_opt}
if [ ${do_posix} = yes ] ; then
EXTENSION=${EXTENSION}P
<font color='#997700'>@@ -294,17 +296,18 @@
</font> # generate table row of results in html
generate_html()
{
<font color='#000088'>+ summary=$1
</font> echo "<TR>"
print_element ${day}
print_element ${hour}:${minute}
print_element ${c_opt}
print_element ${do_posix}
print_element ${do_developmental}
<font color='#880000'>- print_element `grep "Uncovered range" summary.txt | cut -d ':' -f2`
- print_element `grep "age Not Exec" summary.txt | cut -d ':' -f2`
- print_element `grep "age Exec" summary.txt | cut -d ':' -f2`
- print_element `grep "Bytes Not Exec" summary.txt | cut -d ':' -f2`
- print_element `grep "Bytes Analyzed" summary.txt | cut -d ':' -f2`
</font><font color='#000088'>+ print_element `grep "Uncovered range" ${summary} | cut -d ':' -f2`
+ print_element `grep "age Not Exec" ${summary} | cut -d ':' -f2`
+ print_element `grep "age Exec" ${summary} | cut -d ':' -f2`
+ print_element `grep "Bytes Not Exec" ${summary} | cut -d ':' -f2`
+ print_element `grep "Bytes Analyzed" ${summary} | cut -d ':' -f2`
</font> print_element "<A HREF=\"${results_dir}\">untarred</A> " \
"<A HREF=\"${results_dir}.tar.bz2\">tarball</A> "
echo "</TR>"
<font color='#997700'>@@ -325,17 +328,8 @@
</font> cd ${BASEDIR}/${BSP}-tests/
check_status $? "cd ${BSP}-tests"
<font color='#880000'>- rm -f summary.txt annotated.txt uncovered.txt branch.txt sizes.txt
-
- ( check_endof ; \
- echo "Optimization Level : " ${c_opt} ; \
- echo "POSIX Enabled : " ${do_posix} ; \
- echo "Developmental Code : " ${do_developmental} ; \
- ) >summary.txt
</font> rm -rf ${results_dir}
<font color='#880000'>- # XXX temporary until output directory really supported
- mkdir ${results_dir}
- # XXX end of temporary
</font><font color='#000088'>+ mkdir ${results_dir}
</font> ${COVBASE}/covoar \
-O ${results_dir} \
-T ${TARGET} \
<font color='#997700'>@@ -343,29 +337,33 @@
</font> -s rtems.syms \
-E ${COVBASE}/Explanations.txt \
-e exe -c ${RTEMSEXT}.${COVEXT} \
<font color='#880000'>- *.exe >> summary.txt
</font><font color='#000088'>+ *.exe > ${results_dir}/summary.txt
</font> check_status $? "covoar failed"
<font color='#880000'>- (echo "====== Largest Range Sizes (Size and Count)======" ; \
- grep ^Size uncovered.txt | cut -d':' -f2 | sort -n | uniq -c | \
- tail -15 | sed -e 's/ *\([0-9]*\) *\([0-9]*\)/\2 \1/' | sort -n -r | \
- while read l; do printf "%6d %6d\n" $l; done ; \
- echo "=====================================" ) >>summary.txt
</font><font color='#000088'>+ # This should be made obsolete by sortable tables.<span style="background-color: #FF0000"> </span>
+ #(echo "====== Largest Range Sizes (Size and Count)======" ; \
+ # grep ^Size uncovered.txt | cut -d':' -f2 | sort -n | uniq -c | \
+ # tail -15 | sed -e 's/ *\([0-9]*\) *\([0-9]*\)/\2 \1/' | sort -n -r | \
+ # while read l; do printf "%6d %6d\n" $l; done ; \
+ # echo "=====================================" ) >>summary.txt
</font>
<font color='#880000'>- generate_html >row.html
</font><font color='#000088'>+ check_endof >${results_dir}/testsWithNoEndOfTest.txt
</font>
<font color='#880000'>- cat summary.txt
</font><font color='#000088'>+ # Generate the configuration settings file
+ (
+ echo "#"
+ echo "# Settings for this coverage test run"
+ echo "#"
+ echo
+ print_verbose
+ ) >${results_dir}/configuration.txt
</font>
<font color='#880000'>- # Now create the archive of information
</font><font color='#000088'>+ # XXX summary should be in output directory
+ generate_html ${results_dir}/summary.txt >${results_dir}/row.html
</font>
<font color='#880000'>- # XXX temporary until output directory really supported
- cp *.txt *.html ${results_dir}
- # XXX end of temporary
-
- # XXX temporary until generated into output directory
- cp ${COVBASE}/Explanations.txt.NotFound ${results_dir}
- # XXX end of temporary
</font><font color='#000088'>+ cat ${results_dir}/summary.txt ${results_dir}/testsWithNoEndOfTest.txt
</font>
<font color='#000088'>+ # Now create the archive of information
</font> cp ${COVBASE}/covoar.css ${results_dir}
echo "Results saved in ${results_dir}.tar.bz2"
tar cjf ${results_dir}.tar.bz2 ${results_dir}
<font color='#997700'>@@ -609,17 +607,6 @@
</font> if [ ${do_reports} = "yes" ] ; then
echo "Generating reports..."
<font color='#880000'>- # Generate the configuration settings file
- ( \
- echo "#"
- echo "# Settings for this coverage test run"
- echo "#"
- echo
- echo "Compiler version: " `${TARGET}-gcc --version | grep gcc`
- echo "Optimization flag " ${c_opt}
- print_verbose
- ) > ${BASEDIR}/${BSP}-tests/configuration.txt
-
</font> cd ${BASEDIR}/${BSP}-tests/
check_status $? "cd ${BSP}-tests"
</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>