<!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-21)</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>jennifer</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-05-21 Jennifer.Averett@OARcorp.com
* ConfigFile.cc, Makefile, ReportsBase.cc, ReportsBase.h,
ReportsHtml.cc, ReportsHtml.h, ReportsText.cc, ReportsText.h,
TraceConverter.cc, app_common.cc, app_common.h, configFile.txt,
configfile_test.cc, covoar.cc, covoar.css, do_coverage,
rtems_config.in: Added ProjectName and timestamp to report heading.
Modified configuration to handle spaces in project name.
</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.270&r2=text&tr2=1.271&diff_format=h">M</a></td><td width='1%'>1.271</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/ConfigFile.cc.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>rtems-coverage/ConfigFile.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/Makefile.diff?r1=text&tr1=1.22&r2=text&tr2=1.23&diff_format=h">M</a></td><td width='1%'>1.23</td><td width='100%'>rtems-coverage/Makefile</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsBase.h.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>rtems-coverage/ReportsBase.h</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.14&r2=text&tr2=1.15&diff_format=h">M</a></td><td width='1%'>1.15</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/ReportsHtml.h.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>rtems-coverage/ReportsHtml.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsHtml.cc.diff?r1=text&tr1=1.23&r2=text&tr2=1.24&diff_format=h">M</a></td><td width='1%'>1.24</td><td width='100%'>rtems-coverage/ReportsHtml.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsText.h.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>rtems-coverage/ReportsText.h</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/ReportsText.cc.diff?r1=text&tr1=1.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</td><td width='100%'>rtems-coverage/ReportsText.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/TraceConverter.cc.diff?r1=text&tr1=1.10&r2=text&tr2=1.11&diff_format=h">M</a></td><td width='1%'>1.11</td><td width='100%'>rtems-coverage/TraceConverter.cc</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/app_common.h.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>rtems-coverage/app_common.h</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.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</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/configFile.txt.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>rtems-coverage/configFile.txt</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/configfile_test.cc.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>rtems-coverage/configfile_test.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.28&r2=text&tr2=1.29&diff_format=h">M</a></td><td width='1%'>1.29</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/covoar.css.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/covoar.css</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.62&r2=text&tr2=1.63&diff_format=h">M</a></td><td width='1%'>1.63</td><td width='100%'>rtems-coverage/do_coverage</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//gcc-testing/rtems-coverage/rtems_config.in.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>rtems-coverage/rtems_config.in</td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.270 gcc-testing/rtems-coverage/ChangeLog:1.271
--- gcc-testing/rtems-coverage/ChangeLog:1.270 Fri May 21 09:54:29 2010
+++ gcc-testing/rtems-coverage/ChangeLog Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -1,3 +1,12 @@
</font><font color='#000088'>+2010-05-21 Jennifer.Averett@OARcorp.com
+
+ * ConfigFile.cc, Makefile, ReportsBase.cc, ReportsBase.h,
+ ReportsHtml.cc, ReportsHtml.h, ReportsText.cc, ReportsText.h,
+ TraceConverter.cc, app_common.cc, app_common.h, configFile.txt,
+ configfile_test.cc, covoar.cc, covoar.css, do_coverage,
+ rtems_config.in: Added ProjectName and timestamp to report heading.
+ Modified configuration to handle spaces in project name.
+
</font> 2010-05-21 Joel Sherrill <joel.sherrilL@OARcorp.com>
* do_coverage, rtems_items.sed: Add report on size of unreferenced
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ConfigFile.cc:1.1 gcc-testing/rtems-coverage/ConfigFile.cc:1.2
--- gcc-testing/rtems-coverage/ConfigFile.cc:1.1 Wed May 5 18:09:36 2010
+++ gcc-testing/rtems-coverage/ConfigFile.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -12,6 +12,7 @@
</font> #include "ConfigFile.h"
#include <string.h>
#include <stdio.h>
<font color='#000088'>+#include <ctype.h>
</font>
namespace Configuration {
<font color='#997700'>@@ -31,11 +32,13 @@
</font> )
{
#define METHOD "FileReader::processFile - "
<font color='#880000'>- FILE *in;
- char line[256];
- char option[256];
- char value[256];
- int line_no;
</font><font color='#000088'>+ FILE * in;
+ char line[256];
+ char option[256];
+ char value[256];
+ int line_no;
+ int i;
+ int j;
</font>
if ( file == NULL ) {
fprintf( stderr, METHOD "NULL filename\n" );
<font color='#997700'>@@ -50,17 +53,89 @@
</font>
line_no = 0;
while (fgets(line, sizeof(line), in) != NULL) {
<font color='#000088'>+ size_t length;
</font>
line_no++;
<font color='#880000'>- /* Ignore empty lines and comments */
- if (line[0] == '#' || line[0] == '\n')
</font><font color='#000088'>+ length = strlen( line );
+ if ( line[length - 1] != '\n' ) {
+ fprintf(
+ stderr,
+ "%s: line %d is too long",
+ file,
+ line_no
+ );
</font> continue;
<font color='#000088'>+ }
+
+ line[length - 1] = '\0';
+ length--;
+
+ /*
+ * Strip off comments at end of line
+ *
+ * LHS = RHS # comment
+ */
+ for (i=0 ; i<length ; i++ ) {
+ if ( line[i] == '#' ) {
+ line[i] = '\0';
+ length = i;
+ break;
+ }
+ }
+
+ /*
+ * Strip off trailing white space
+ */
+ for (i=length-1 ; i>=0 && isspace(line[i]) ; i-- )
+ ;
+
+ line[i+1] = '\0';
+ length = i+1;
+
+ /* Ignore empty lines. We have stripped
+ * all comments and blanks therefore, only
+ * an empty string needs to be checked.
+ */
+ if (line[0] == '\0')<span style="background-color: #FF0000"> </span>
+ continue;
+
+ if (sscanf(line, "%s", option) != 1) {
+ fprintf(
+ stderr,
+ "%s: line %d is invalid: %s\n",
+ file,
+ line_no,
+ line
+ );
+ continue;
+ }
+
+ for (i=0; ((line[i] != '=') && (i<length)); i++)
+ ;
+
+ if (i == length) {
+ fprintf(
+ stderr,
+ "%s: line %d is invalid: %s\n",
+ file,
+ line_no,
+ line
+ );
+ continue;
+ }
</font>
<font color='#880000'>- if (sscanf(line, "%s = %[^ \r\n#]", option, value) != 2) {
</font><font color='#000088'>+ i++;
+ value[0] = '\0';
+ while ( isspace(line[i]) )
+ i++;
+ for (j=0; line[i] != '\0'; i++, j++ )
+ value[j] = line[i];
+ value[j] = '\0';<span style="background-color: #FF0000"> </span>
+ if (value[0] == '\0') {
</font> fprintf(
stderr,
<font color='#880000'>- "%s: line %d is invalid: %s",
</font><font color='#000088'>+ "%s: line %d is invalid: %s\n",
</font> file,
line_no,
line
<font color='#006600'>diff -u gcc-testing/rtems-coverage/Makefile:1.22 gcc-testing/rtems-coverage/Makefile:1.23
--- gcc-testing/rtems-coverage/Makefile:1.22 Wed May 12 13:12:36 2010
+++ gcc-testing/rtems-coverage/Makefile Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -57,7 +57,8 @@
</font>
INSTALLED= \
../bin/qemu-dump-trace \
<font color='#880000'>- ../bin/trace-converter
</font><font color='#000088'>+ ../bin/trace-converter \
+ ../bin/covoar
</font>
all: $(PROGRAMS) ${INSTALL_DIR} $(INSTALLED)
<font color='#997700'>@@ -71,6 +72,9 @@
</font> ../bin/trace-converter: trace-converter ${INSTALL_DIR}
cp trace-converter ../bin
<font color='#000088'>+../bin/covoar: covoar ${INSTALL_DIR}
+ cp covoar ../bin
+
</font> # EXECUTABLES
qemu-dump-trace: qemu-dump-trace.c ${INSTALL_DIR}
$(CXX) -o $(@) qemu-dump-trace.c
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.h:1.10 gcc-testing/rtems-coverage/ReportsBase.h:1.11
--- gcc-testing/rtems-coverage/ReportsBase.h:1.10 Wed May 19 09:47:12 2010
+++ gcc-testing/rtems-coverage/ReportsBase.h Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -15,6 +15,7 @@
</font>
#include <stdint.h>
#include <string>
<font color='#000088'>+#include <time.h>
</font> #include "DesiredSymbols.h"
namespace Coverage {
<font color='#997700'>@@ -27,7 +28,7 @@
</font> class ReportsBase {
public:
<font color='#880000'>- ReportsBase();
</font><font color='#000088'>+ ReportsBase( time_t timestamp );
</font> ~ReportsBase();
/*!
<font color='#997700'>@@ -115,6 +116,11 @@
</font> std::string reportExtension_m;
/*!
<font color='#000088'>+ * This member variable contains the timestamp for the report.
+ */
+ time_t timestamp_m;
+
+ /*!
</font> * This method Opens a report file and verifies that it opened
* correctly. Upon failure NULL is returned.
*
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsBase.cc:1.14 gcc-testing/rtems-coverage/ReportsBase.cc:1.15
--- gcc-testing/rtems-coverage/ReportsBase.cc:1.14 Wed May 19 09:47:12 2010
+++ gcc-testing/rtems-coverage/ReportsBase.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -20,8 +20,9 @@
</font>
namespace Coverage {
<font color='#880000'>-ReportsBase::ReportsBase():
- reportExtension_m("")
</font><font color='#000088'>+ReportsBase::ReportsBase( time_t timestamp ):
+ reportExtension_m(""),
+ timestamp_m( timestamp )
</font> {
}
<font color='#997700'>@@ -421,6 +422,7 @@
</font> CloseSymbolSummaryFile( report );
}
<font color='#000088'>+
</font> void GenerateReports()
{
typedef std::list<ReportsBase *> reportList_t;
<font color='#997700'>@@ -430,9 +432,13 @@
</font> std::string reportName;
ReportsBase* reports;
<font color='#880000'>- reports = new ReportsText();
</font><font color='#000088'>+ time_t timestamp;
+
+<span style="background-color: #FF0000"> </span>
+ timestamp = time(NULL); /* get current cal time */
+ reports = new ReportsText(timestamp);
</font> reportList.push_back(reports);
<font color='#880000'>- reports = new ReportsHtml();
</font><font color='#000088'>+ reports = new ReportsHtml(timestamp);
</font> reportList.push_back(reports);
for (ritr = reportList.begin(); ritr != reportList.end(); ritr++ ) {
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.h:1.10 gcc-testing/rtems-coverage/ReportsHtml.h:1.11
--- gcc-testing/rtems-coverage/ReportsHtml.h:1.10 Wed May 19 09:47:12 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.h Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -26,7 +26,7 @@
</font> class ReportsHtml: public ReportsBase {
public:
<font color='#880000'>- ReportsHtml();
</font><font color='#000088'>+ ReportsHtml( time_t timestamp );
</font> ~ReportsHtml();
/*!
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsHtml.cc:1.23 gcc-testing/rtems-coverage/ReportsHtml.cc:1.24
--- gcc-testing/rtems-coverage/ReportsHtml.cc:1.23 Wed May 19 13:16:17 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -33,8 +33,8 @@
</font>
namespace Coverage {
<font color='#880000'>- ReportsHtml::ReportsHtml():
- ReportsBase()
</font><font color='#000088'>+ ReportsHtml::ReportsHtml( time_t timestamp ):
+ ReportsBase( timestamp )
</font> {
reportExtension_m = ".html";
}
<font color='#997700'>@@ -64,7 +64,26 @@
</font> // Open the file
aFile = OpenFile( fileName );
<font color='#880000'>- fprintf( aFile, "<strong>Reports Available</strong>\n" );
</font><font color='#000088'>+ fprintf(
+ aFile,
+ "<title>Index</title>\n"
+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "Coverage Analysis Reports</div>\n"
+ "<div class =\"datetime\">%s</div>\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
+ );
+
</font> fprintf( aFile, "<ul>\n" );
PRINT_ITEM( "Coverage Report", "uncovered" );
<font color='#997700'>@@ -122,9 +141,23 @@
</font> fprintf(
aFile,
"<title>Annotated Report</title>\n"
<font color='#880000'>- "<pre class=\"heading-title\">Annotated Report</pre>\n"
</font><font color='#000088'>+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "Annotated Report</div>\n"
+ "<div class =\"datetime\">%s</div>\n"
</font> "<body>\n"
<font color='#880000'>- "<pre class=\"code\">\n"
</font><font color='#000088'>+ "<pre class=\"code\">\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
</font> );
return aFile;
<font color='#997700'>@@ -145,9 +178,22 @@
</font> fprintf(
aFile,
"<title>Branch Report</title\n"
<font color='#880000'>- "<pre class=\"heading-title\">Branch Report</pre>\n"
</font><font color='#000088'>+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "Branch Report</div>\n"
+ "<div class =\"datetime\">%s</div>\n"
</font> "<body>\n"
<font color='#880000'>- "<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
</font><font color='#000088'>+ "<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
</font> TABLE_HEADER_CLASS "\">\n"
"<thead>\n"
"<tr>\n"
<font color='#997700'>@@ -159,7 +205,8 @@
</font> "<th class=\"table-sortable:default\" align=\"left\">Explanation</th>\n"
"</tr>\n"
"</thead>\n"
<font color='#880000'>- "<tbody>\n"
</font><font color='#000088'>+ "<tbody>\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
</font> );
}
<font color='#997700'>@@ -179,9 +226,22 @@
</font> fprintf(
aFile,
"<title>Coverage Report</title>\n"
<font color='#880000'>- "<pre class=\"heading-title\">Coverage Report</pre>\n"
- "<body>\n"
- "<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
</font><font color='#000088'>+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "Coverage Report</div>\n"
+ "<div class =\"datetime\">%s</div>\n"
+ "<body>\n"
+ "<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
</font> TABLE_HEADER_CLASS "\">\n"
"<thead>\n"
"<tr>\n"
<font color='#997700'>@@ -193,7 +253,9 @@
</font> "<th class=\"table-sortable:default\" align=\"left\">Explanation</th>\n"
"</tr>\n"
"</thead>\n"
<font color='#880000'>- "<tbody>\n"
</font><font color='#000088'>+ "<tbody>\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
+
</font> );
return aFile;
<font color='#997700'>@@ -212,7 +274,20 @@
</font> fprintf(
aFile,
"<title> Report</title>\n"
<font color='#880000'>- "<pre class=\"heading-title\">No Range Report</pre>\n"
</font><font color='#000088'>+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "No Range Report</div>\n"
+ "<div class =\"datetime\">%s</div>\n"
</font> "<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
TABLE_HEADER_CLASS "\">\n"
<font color='#997700'>@@ -221,7 +296,9 @@
</font> "<th class=\"table-sortable:default\" align=\"left\">Symbol</th>\n"
"</tr>\n"
"</thead>\n"
<font color='#880000'>- "<tbody>\n"
</font><font color='#000088'>+ "<tbody>\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
+
</font> );
return aFile;
<font color='#997700'>@@ -242,7 +319,20 @@
</font> fprintf(
aFile,
"<title>Size Report</title>\n"
<font color='#880000'>- "<pre class=\"heading-title\">Size Report</pre>\n"
</font><font color='#000088'>+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "Size Report</div>\n"
+ "<div class =\"datetime\">%s</div>\n"
</font> "<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
TABLE_HEADER_CLASS "\">\n"
<font color='#997700'>@@ -253,7 +343,9 @@
</font> "<th class=\"table-sortable:default\" align=\"left\">File</th>\n"
"</tr>\n"
"</thead>\n"
<font color='#880000'>- "<tbody>\n"
</font><font color='#000088'>+ "<tbody>\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
+
</font> );
return aFile;
}
<font color='#997700'>@@ -271,7 +363,20 @@
</font> fprintf(
aFile,
"<title>Symbol Summary Report</title>\n"
<font color='#880000'>- "<pre class=\"heading-title\">Symbol Summary Report</pre>\n"
</font><font color='#000088'>+ "<div class=\"heading-title\">"
+ );
+
+ if (projectName)
+ fprintf(
+ aFile,
+ "%s</br>",
+ projectName
+ );
+
+ fprintf(
+ aFile,
+ "Symbol Summary Report</div>\n"
+ "<div class =\"datetime\">%s</div>\n"
</font> "<body>\n"
"<table class=\"covoar table-autosort:0 table-autofilter table-stripeclass:covoar-tr-odd"
TABLE_HEADER_CLASS "\">\n"
<font color='#997700'>@@ -290,7 +395,9 @@
</font> "<th class=\"table-sortable:numeric\" align=\"center\">Percent</br>Uncovered</br>Bytes</th>\n"
"</tr>\n"
"</thead>\n"
<font color='#880000'>- "<tbody>\n"
</font><font color='#000088'>+ "<tbody>\n",
+ asctime( localtime(×tamp_m) )<span style="background-color: #FF0000"> </span>
+
</font> );
return aFile;
}
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsText.h:1.7 gcc-testing/rtems-coverage/ReportsText.h:1.8
--- gcc-testing/rtems-coverage/ReportsText.h:1.7 Wed May 19 09:47:12 2010
+++ gcc-testing/rtems-coverage/ReportsText.h Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -25,7 +25,7 @@
</font> class ReportsText: public ReportsBase {
public:
<font color='#880000'>- ReportsText();
</font><font color='#000088'>+ ReportsText( time_t timestamp );
</font> ~ReportsText();
/*!
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ReportsText.cc:1.8 gcc-testing/rtems-coverage/ReportsText.cc:1.9
--- gcc-testing/rtems-coverage/ReportsText.cc:1.8 Wed May 19 09:47:12 2010
+++ gcc-testing/rtems-coverage/ReportsText.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -15,8 +15,8 @@
</font>
namespace Coverage {
<font color='#880000'>-ReportsText::ReportsText():
- ReportsBase()
</font><font color='#000088'>+ReportsText::ReportsText( time_t timestamp ):
+ ReportsBase( timestamp )
</font> {
reportExtension_m = ".txt";
}
<font color='#006600'>diff -u gcc-testing/rtems-coverage/TraceConverter.cc:1.10 gcc-testing/rtems-coverage/TraceConverter.cc:1.11
--- gcc-testing/rtems-coverage/TraceConverter.cc:1.10 Tue May 18 09:44:01 2010
+++ gcc-testing/rtems-coverage/TraceConverter.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -23,7 +23,6 @@
</font> #include "app_common.h"
#include "TargetFactory.h"
<font color='#880000'>-const char* dynamicLibrary = NULL;
</font> char* progname;
void usage()
<font color='#006600'>diff -u gcc-testing/rtems-coverage/app_common.h:1.11 gcc-testing/rtems-coverage/app_common.h:1.12
--- gcc-testing/rtems-coverage/app_common.h:1.11 Mon May 17 16:47:07 2010
+++ gcc-testing/rtems-coverage/app_common.h Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -18,6 +18,9 @@
</font> extern const char* outputDirectory;
extern bool BranchInfoAvailable;
extern Target::TargetBase* TargetInfo;
<font color='#000088'>+extern const char* dynamicLibrary;
+extern const char* projectName;
+
</font>
bool FileIsNewer( const char *f1, const char *f2 );<span style="background-color: #FF0000"> </span>
bool FileIsReadable( const char *f1 );<span style="background-color: #FF0000"> </span>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/app_common.cc:1.8 gcc-testing/rtems-coverage/app_common.cc:1.9
--- gcc-testing/rtems-coverage/app_common.cc:1.8 Tue May 18 09:02:12 2010
+++ gcc-testing/rtems-coverage/app_common.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -32,6 +32,9 @@
</font> const char* outputDirectory = ".";
bool BranchInfoAvailable = false;
Target::TargetBase* TargetInfo = NULL;
<font color='#000088'>+const char* dynamicLibrary = NULL;
+const char* projectName = NULL;
+
</font>
bool FileIsNewer(
const char *f1,
<font color='#006600'>diff -u gcc-testing/rtems-coverage/configFile.txt:1.1 gcc-testing/rtems-coverage/configFile.txt:1.2
--- gcc-testing/rtems-coverage/configFile.txt:1.1 Wed May 5 18:09:36 2010
+++ gcc-testing/rtems-coverage/configFile.txt Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -3,11 +3,22 @@
</font> #
# $Id$
#
<font color='#000088'>+
+projectName = RTEMS 4.10
+
</font> verbose = no<span style="background-color: #FF0000"> </span>
verbose
verbose yes<span style="background-color: #FF0000"> </span>
<font color='#880000'>-bad_option no
</font><font color='#000088'>+bad_option = no
+
+verbose = yes # comment
+
+verbose = no # comment
</font>
<font color='#000088'>+ verbose = yes<span style="background-color: #FF0000"> </span>
+# next line is filled with spaces
+<span style="background-color: #FF0000"> </span>
+ # comment
</font>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/configfile_test.cc:1.1 gcc-testing/rtems-coverage/configfile_test.cc:1.2
--- gcc-testing/rtems-coverage/configfile_test.cc:1.1 Wed May 5 18:09:36 2010
+++ gcc-testing/rtems-coverage/configfile_test.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -6,8 +6,9 @@
</font> #include <stdio.h>
Configuration::Options_t Options[] = {
<font color='#880000'>- { "verbose", NULL },
- { NULL, NULL }
</font><font color='#000088'>+ { "projectName", NULL },
+ { "verbose", NULL },
+ { NULL, NULL }
</font> };
int main(
<font color='#006600'>diff -u gcc-testing/rtems-coverage/covoar.cc:1.28 gcc-testing/rtems-coverage/covoar.cc:1.29
--- gcc-testing/rtems-coverage/covoar.cc:1.28 Wed May 19 09:02:21 2010
+++ gcc-testing/rtems-coverage/covoar.cc Fri May 21 15:14:29 2010
</font><font color='#997700'>@@ -34,7 +34,6 @@
</font> int coverageExtensionLength = 0;
Coverage::CoverageFormats_t coverageFormat;
Coverage::CoverageReaderBase* coverageReader = NULL;
<font color='#880000'>-const char* dynamicLibrary = NULL;
</font> char* executable = NULL;
const char* executableExtension = NULL;
int executableExtensionLength = 0;
<font color='#997700'>@@ -65,6 +64,7 @@
</font> " -1 EXECUTABLE - name of executable to get symbols from\n"
" -e EXE_EXTENSION - extension of the executables to analyze\n"
" -c COVERAGEFILE_EXTENSION - extension of the coverage files to analyze\n"
<font color='#000088'>+ " -p PROJECT_NAME - name of the project\n"
</font> " -C ConfigurationFileName - name of configuration file\n"
" -O Output_Directory - name of output directory (default=."
"\n",
<font color='#997700'>@@ -91,6 +91,7 @@
</font> { "coverageExtension", NULL },
{ "target", NULL },
{ "verbose", NULL },
<font color='#000088'>+ { "projectName", NULL },
</font> { NULL, NULL }
};
<font color='#997700'>@@ -127,6 +128,7 @@
</font> GET_STRING( "outputDirectory", outputDirectory );
GET_STRING( "executableExtension", executableExtension );
GET_STRING( "coverageExtension", coverageFileExtension );
<font color='#000088'>+ GET_STRING( "projectName", projectName );
</font>
// Now calculate some values
if ( coverageFileExtension )
<font color='#997700'>@@ -159,7 +161,7 @@
</font> //
progname = argv[0];
<font color='#880000'>- while ((opt = getopt(argc, argv, "C:1:L:e:c:E:f:s:T:O:v")) != -1) {
</font><font color='#000088'>+ while ((opt = getopt(argc, argv, "C:1:L:e:c:E:f:s:T:O:p:v")) != -1) {
</font> switch (opt) {
case 'C': CoverageConfiguration->processFile( optarg ); break;
case '1': singleExecutable = optarg; break;
<font color='#997700'>@@ -172,6 +174,7 @@
</font> case 'T': target = optarg; break;
case 'O': outputDirectory = optarg; break;
case 'v': Verbose = true; break;
<font color='#000088'>+ case 'p': projectName = optarg; break;
</font> default: /* '?' */
usage();
exit( -1 );
<font color='#006600'>diff -u gcc-testing/rtems-coverage/covoar.css:1.4 gcc-testing/rtems-coverage/covoar.css:1.5
--- gcc-testing/rtems-coverage/covoar.css:1.4 Mon May 17 09:39:23 2010
+++ gcc-testing/rtems-coverage/covoar.css Fri May 21 15:14:30 2010
</font><font color='#997700'>@@ -233,7 +233,7 @@
</font> .heading-title {
text-align: center;
color: rgb(0,0,0);
<font color='#880000'>- font-size: 4.0em;
</font><font color='#000088'>+ font-size: 3.5em;
</font> font-weight: bold;
line-height: 0.9;
padding-top: 5px;
<font color='#997700'>@@ -244,7 +244,7 @@
</font>
.datetime {
color: rgb(55,55,55);
<font color='#880000'>- font-size: 0.8em;
</font><font color='#000088'>+ font-size: 1.0em;
</font> padding-top: 5px;
padding-left: 0px;
text-align: center;
<font color='#006600'>diff -u gcc-testing/rtems-coverage/do_coverage:1.62 gcc-testing/rtems-coverage/do_coverage:1.63
--- gcc-testing/rtems-coverage/do_coverage:1.62 Fri May 21 09:54:29 2010
+++ gcc-testing/rtems-coverage/do_coverage Fri May 21 15:14:30 2010
</font><font color='#997700'>@@ -42,6 +42,7 @@
</font> -f -- publish the results to ftp site (default=no)
-t -- save the results locally (default=no)
-O -- output directory (default=BSP-CONF-YYYYMMDD-HHMM)
<font color='#000088'>+ -p -- project name (default empty)
</font>
Notes: + There are currently NO checks at each step to determine if
the previous steps were performed!!!
<font color='#997700'>@@ -347,13 +348,14 @@
</font> -e "s,@OUTPUT_DIRECTORY@,${results_dir}," \
-e "s/@EXECUTABLE_EXTENSION@/exe/" \
-e "s/@COVERAGE_EXTENSION@/${RTEMSEXT}.${COVEXT}/" \
<font color='#000088'>+ -e "s/@PROJECT_NAME@/RTEMS ${RTEMS_VERSION}/" \
</font> <${COVBASE}/rtems_config.in \
>${BASEDIR}/${BSP}-tests/config
check_status $? "Unable to generate COVOAR config file"
rm -rf ${results_dir}
mkdir ${results_dir}
<font color='#880000'>- ${COVBASE}/covoar -C ${BASEDIR}/${BSP}-tests/config \
</font><font color='#000088'>+ covoar -C ${BASEDIR}/${BSP}-tests/config \
</font> *.exe > ${results_dir}/summary.txt
check_status $? "covoar failed"
<font color='#006600'>diff -u gcc-testing/rtems-coverage/rtems_config.in:1.1 gcc-testing/rtems-coverage/rtems_config.in:1.2
--- gcc-testing/rtems-coverage/rtems_config.in:1.1 Wed May 19 09:02:21 2010
+++ gcc-testing/rtems-coverage/rtems_config.in Fri May 21 15:14:30 2010
</font><font color='#997700'>@@ -25,4 +25,6 @@
</font> # This is the extension on the executable files.
executableExtension = @EXECUTABLE_EXTENSION@
<font color='#000088'>+# This is the project name.
+projectName = @PROJECT_NAME@
</font>
</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>