change log for gcc-testing (2010-05-12)

rtems-vc at rtems.org rtems-vc at rtems.org
Wed May 12 20:10:02 UTC 2010


 *jennifer*:
2010-05-12	Jennifer Averett <Jennifer.Averett at OARcorp.com>

	* ReportsHtml.cc: Added sort ability to size report. Resolved a bug
	that resulted in mal-formed html.

M  1.242  rtems-coverage/ChangeLog
M   1.12  rtems-coverage/ReportsHtml.cc

diff -u gcc-testing/rtems-coverage/ChangeLog:1.241 gcc-testing/rtems-coverage/ChangeLog:1.242
--- gcc-testing/rtems-coverage/ChangeLog:1.241	Wed May 12 14:30:54 2010
+++ gcc-testing/rtems-coverage/ChangeLog	Wed May 12 14:34:38 2010
@@ -1,3 +1,8 @@
+2010-05-12	Jennifer Averett <Jennifer.Averett at OARcorp.com>
+
+	* ReportsHtml.cc: Added sort ability to size report. Resolved a bug
+	that resulted in mal-formed html.
+
 2010-05-12	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* covoar.cc: Process single executable file name differently.

diff -u gcc-testing/rtems-coverage/ReportsHtml.cc:1.11 gcc-testing/rtems-coverage/ReportsHtml.cc:1.12
--- gcc-testing/rtems-coverage/ReportsHtml.cc:1.11	Wed May 12 14:22:17 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.cc	Wed May 12 14:34:38 2010
@@ -118,7 +118,6 @@
       // Put header information into the file
       fprintf(
         aFile,
-        "<pre class=\"code\">\n"
         "<table class=\"covoar table-autosort:0 table-autofilter table-autopage:10 table-page-number:pagenum table-page-count:pages\">\n"
         "<thead>\n"
         "<tr>\n"
@@ -149,7 +148,6 @@
     // Put header information into the file
     fprintf(
       aFile,
-      "<pre class=\"code\">\n"
       "<table class=\"covoar table-autosort:0 table-autofilter table-autopage:10 table-page-number:pagenum table-page-count:pages\">\n"
       "<thead>\n"
       "<tr>\n"
@@ -178,13 +176,14 @@
     // Put header information into the file
     fprintf(
       aFile,
-      "<table class=\"covoar-table\">\n"
-      "<tbody class=\"covoar-tbody\">\n"
-      "<tr class=\"covoar-tr covoar-tr-first\">\n"
-      "<th class=\"covoar-th\">Size</th>\n"
-      "<th class=\"covoar-th\">Symbol</th>\n"
-      "<th class=\"covoar-th\">File</th>\n"
+      "<table class=\"covoar table-autosort:0 table-autofilter table-autopage:10 table-page-number:pagenum table-page-count:pages\">\n"
+      "<thead>\n"
+      "<tr>\n"
+      "<th class=\"table-sortable:numeric\" align=\"left\">Size</th>\n"
+      "<th class=\"table-sortable:default\" align=\"left\">Symbol</th>\n"
+      "<th class=\"table-sortable:default\" align=\"left\">File</th>\n"
       "</tr>\n"
+      "</thead>\n"
     );
     return aFile;
   }
@@ -412,7 +411,6 @@
     );
 
     // Mark the background color different for odd and even lines.
-    fprintf( report, "</tr>\n");
     if ( ( count%2 ) == 0 )
       fprintf( report, "<tr class=\"covoar-tr covoar-tr-even\">\n");
     else
@@ -466,7 +464,6 @@
 
 
     // Mark the background color different for odd and even lines.
-    fprintf( report, "</tr>\n");
     if ( ( count%2 ) == 0 )
       fprintf( report, "<tr class=\"covoar-tr covoar-tr-even\">\n");
     else
@@ -540,7 +537,6 @@
   )
   {
     // Mark the background color different for odd and even lines.
-    fprintf( report, "</tr>\n");
     if ( ( count%2 ) == 0 )
       fprintf( report, "<tr class=\"covoar-tr covoar-tr-even\">\n");
     else
@@ -567,7 +563,7 @@
       range->lowSourceLine.c_str()
     );
 
-
+    fprintf( report, "</tr>\n");
 
     return true;
   }
@@ -580,7 +576,6 @@
   )
   {
     // Mark the background color different for odd and even lines.
-    fprintf( report, "</tr>\n");
     if ( ( count%2 ) == 0 )
       fprintf( report, "<tr class=\"covoar-tr covoar-tr-even\">\n");
     else
@@ -607,6 +602,7 @@
       range->lowSourceLine.c_str()
     );
 
+    fprintf( report, "</tr>\n");
     return true;
   }
 
@@ -680,11 +676,21 @@
     FILE*  aFile
   )
   {
-    fprintf( aFile, "</tbody>\n" );
-    fprintf( aFile, "</table>\n" );
-    fprintf( aFile, "</pre>\n" );
-    fprintf( aFile,"</body>\n");
-    fprintf( aFile,"</html>");
+    fprintf(
+      aFile,
+      "<tfoot>\n"
+      "<tr>\n"
+      "<td class=\"table-page:previous\" style=\"cursor:pointer;\">< < Previous</td>\n"
+      "<td colspan=\"1\" style=\"text-align:center;\">Page <span id=\"pagenum\"></span> of <span id=\"pages\"></span></td>\n"
+      "<td class=\"table-page:next\" style=\"cursor:pointer;\">Next > ></td>\n"
+      "</tr>\n"
+      "</tfoot>\n"
+      "</tbody>\n"
+      "</table>\n" 
+      "</pre>\n" 
+      "</body>\n"
+      "</html>"
+    );
 
     CloseFile( aFile );
   }


 *joel*:
2010-05-12	Joel Sherrill <joel.sherrill at oarcorp.com>

	* ReportsHtml.cc, ReportsHtml.h, do_coverage: Tidy up reports.

M  1.240  rtems-coverage/ChangeLog
M    1.8  rtems-coverage/ReportsHtml.h
M   1.11  rtems-coverage/ReportsHtml.cc
M   1.57  rtems-coverage/do_coverage

diff -u gcc-testing/rtems-coverage/ChangeLog:1.239 gcc-testing/rtems-coverage/ChangeLog:1.240
--- gcc-testing/rtems-coverage/ChangeLog:1.239	Wed May 12 14:09:18 2010
+++ gcc-testing/rtems-coverage/ChangeLog	Wed May 12 14:22:17 2010
@@ -1,3 +1,7 @@
+2010-05-12	Joel Sherrill <joel.sherrill at oarcorp.com>
+
+	* ReportsHtml.cc, ReportsHtml.h, do_coverage: Tidy up reports.
+
 2010-05-12	Joel Sherrill <joel.sherrilL at OARcorp.com>
 
 	* do_coverage: Attempt to add output directory.

diff -u gcc-testing/rtems-coverage/ReportsHtml.h:1.7 gcc-testing/rtems-coverage/ReportsHtml.h:1.8
--- gcc-testing/rtems-coverage/ReportsHtml.h:1.7	Wed May 12 13:12:36 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.h	Wed May 12 14:22:17 2010
@@ -68,6 +68,10 @@
 
     AnnotatedLineState_t lastState_m;
 
+    virtual FILE* OpenAnnotatedFile(
+      const char* const fileName
+    );
+
     virtual FILE* OpenBranchFile(
       const char* const fileName,
       bool              hasBranches

diff -u gcc-testing/rtems-coverage/ReportsHtml.cc:1.10 gcc-testing/rtems-coverage/ReportsHtml.cc:1.11
--- gcc-testing/rtems-coverage/ReportsHtml.cc:1.10	Wed May 12 13:37:58 2010
+++ gcc-testing/rtems-coverage/ReportsHtml.cc	Wed May 12 14:22:17 2010
@@ -82,6 +82,22 @@
       "<link rel=\"stylesheet\" type=\"text/css\" href=\"covoar.css\" media=\"screen\" >\n"
       "<script type=\"text/javascript\" src=\"table.js\"></script>\n"
       "<body>\n"
+    );
+
+    return aFile;
+  }
+
+  FILE* ReportsHtml::OpenAnnotatedFile(
+    const char* const fileName
+  )
+  {
+    FILE *aFile;
+
+    // Open the file
+    aFile = OpenFile(fileName);
+
+    fprintf(
+      aFile,
       "<pre class=\"code\">\n"
     );
 
@@ -387,10 +403,12 @@
     Coverage::Explanation explanation;
 
     explanation.explanation.push_back(
+      "<html><p>\n"
       "This symbol was never referenced by an analyzed executable.  "
       "Therefore there is no size or disassembly for this symbol.  "
-      "This could be due to symbol misspelling or lack of a test for"
+      "This could be due to symbol misspelling or lack of a test for "
       "this symbol."
+      "</p></html>\n"
     );
 
     // Mark the background color different for odd and even lines.

diff -u gcc-testing/rtems-coverage/do_coverage:1.56 gcc-testing/rtems-coverage/do_coverage:1.57
--- gcc-testing/rtems-coverage/do_coverage:1.56	Wed May 12 14:09:18 2010
+++ gcc-testing/rtems-coverage/do_coverage	Wed May 12 14:22:17 2010
@@ -625,7 +625,7 @@
       results_dir=${BSP}${EXT}-${day}-${hour}${minute}
     else
       results_dir=${outputDir}
-    endif
+    fi
 
     generate_symbols >${BASEDIR}/${BSP}-tests/rtems.syms
     syms=`cat ${BASEDIR}/${BSP}-tests/rtems.syms | wc -l`


 *joel*:
2010-05-12	Joel Sherrill <joel.sherrill at oarcorp.com>

	* covoar.cc: Process single executable file name differently.

M  1.241  rtems-coverage/ChangeLog
M   1.22  rtems-coverage/covoar.cc

diff -u gcc-testing/rtems-coverage/ChangeLog:1.240 gcc-testing/rtems-coverage/ChangeLog:1.241
--- gcc-testing/rtems-coverage/ChangeLog:1.240	Wed May 12 14:22:17 2010
+++ gcc-testing/rtems-coverage/ChangeLog	Wed May 12 14:30:54 2010
@@ -1,5 +1,9 @@
 2010-05-12	Joel Sherrill <joel.sherrill at oarcorp.com>
 
+	* covoar.cc: Process single executable file name differently.
+
+2010-05-12	Joel Sherrill <joel.sherrill at oarcorp.com>
+
 	* ReportsHtml.cc, ReportsHtml.h, do_coverage: Tidy up reports.
 
 2010-05-12	Joel Sherrill <joel.sherrilL at OARcorp.com>

diff -u gcc-testing/rtems-coverage/covoar.cc:1.21 gcc-testing/rtems-coverage/covoar.cc:1.22
--- gcc-testing/rtems-coverage/covoar.cc:1.21	Wed May 12 08:33:30 2010
+++ gcc-testing/rtems-coverage/covoar.cc	Wed May 12 14:30:55 2010
@@ -40,7 +40,6 @@
 std::list<Coverage::ExecutableInfo*> executablesToAnalyze;
 const char*                          explanations = NULL;
 char*                                progname;
-bool                                 singleExecutable = false;
 const char*                          symbolsFile = NULL;
 const char*                          target = NULL;
 const char*                          format = NULL;
@@ -145,6 +144,7 @@
   Coverage::ExecutableInfo*                      executableInfo = NULL;
   int                                            i;
   int                                            opt;
+  const char*                                    singleExecutable = NULL;
 
   CoverageConfiguration = new Configuration::FileReader(Options);
   
@@ -155,20 +155,10 @@
 
   while ((opt = getopt(argc, argv, "1:e:c:E:f:s:T:vC:O:")) != -1) {
     switch (opt) {
-      case '1':
-        singleExecutable = true;
-        executableInfo = new Coverage::ExecutableInfo( optarg );
-        executablesToAnalyze.push_back( executableInfo );
-        break;
-      case 'e':
-        executableExtension = optarg;
-        break;
-      case 'c':
-         coverageFileExtension = optarg;
-         break;
-      case 'C':
-         CoverageConfiguration->processFile( optarg );
-         break;
+      case 'C': CoverageConfiguration->processFile( optarg ); break;
+      case '1': singleExecutable = optarg;       break;
+      case 'e': executableExtension = optarg;    break;
+      case 'c': coverageFileExtension = optarg;  break;
       case 'E': explanations          = optarg;  break;
       case 's': symbolsFile           = optarg;  break;
       case 'T': target                = optarg;  break;
@@ -181,11 +171,16 @@
     }
   }
 
+  // Do not trust any arguments until after this point.
   check_configuration();
 
+  // XXX We need to verify that all of the needed arguments are non-NULL.
+
   // If a single executable was specified, process the remaining
   // arguments as coverage file names.
   if (singleExecutable) {
+    executableInfo = new Coverage::ExecutableInfo( singleExecutable );
+    executablesToAnalyze.push_back( executableInfo );
     for (i=optind; i < argc; i++) {
       coverageFileName = argv[i];
       coverageFileNames.push_back( coverageFileName );



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100512/da8400ad/attachment-0001.html>


More information about the vc mailing list