<!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-19)</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-19 Joel Sherrill <joel.sherrilL@OARcorp.com>
* covoar.cc: Add executable and coverage file extension parameters
to configuration file.
* do_coverage: Use configuration file for RTEMS runs.
* rtems_config.in: New file.
</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.263&r2=text&tr2=1.264&diff_format=h">M</a></td><td width='1%'>1.264</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/covoar.cc.diff?r1=text&tr1=1.27&r2=text&tr2=1.28&diff_format=h">M</a></td><td width='1%'>1.28</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.58&r2=text&tr2=1.59&diff_format=h">M</a></td><td width='1%'>1.59</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?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">rtems-coverage/rtems_config.in</font></td></tr>
</table>
<pre>
<font color='#006600'>diff -u gcc-testing/rtems-coverage/ChangeLog:1.263 gcc-testing/rtems-coverage/ChangeLog:1.264
--- gcc-testing/rtems-coverage/ChangeLog:1.263 Tue May 18 10:30:36 2010
+++ gcc-testing/rtems-coverage/ChangeLog Wed May 19 09:02:21 2010
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+2010-05-19 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * covoar.cc: Add executable and coverage file extension parameters
+ to configuration file.
+ * do_coverage: Use configuration file for RTEMS runs.
+ * rtems_config.in: New file.
+
</font> 2010-05-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* ObjdumpProcessor.cc: Now read dlinfo from file.
<font color='#006600'>diff -u gcc-testing/rtems-coverage/covoar.cc:1.27 gcc-testing/rtems-coverage/covoar.cc:1.28
--- gcc-testing/rtems-coverage/covoar.cc:1.27 Tue May 18 09:21:13 2010
+++ gcc-testing/rtems-coverage/covoar.cc Wed May 19 09:02:21 2010
</font><font color='#997700'>@@ -29,14 +29,14 @@
</font> /*
* Variables to control general behavior
*/
<font color='#880000'>-char* coverageFileExtension = NULL;
</font><font color='#000088'>+const char* coverageFileExtension = NULL;
</font> std::list<std::string> coverageFileNames;
int coverageExtensionLength = 0;
Coverage::CoverageFormats_t coverageFormat;
Coverage::CoverageReaderBase* coverageReader = NULL;
const char* dynamicLibrary = NULL;
char* executable = NULL;
<font color='#880000'>-char* executableExtension = NULL;
</font><font color='#000088'>+const char* executableExtension = NULL;
</font> int executableExtensionLength = 0;
std::list<Coverage::ExecutableInfo*> executablesToAnalyze;
const char* explanations = NULL;
<font color='#997700'>@@ -83,12 +83,15 @@
</font> Configuration::FileReader *CoverageConfiguration;
Configuration::Options_t Options[] = {
<font color='#880000'>- { "explanations", NULL },
- { "format", NULL },
- { "symbolsFile ", NULL },
- { "target", NULL },
- { "verbose", NULL },
- { NULL, NULL }
</font><font color='#000088'>+ { "explanations", NULL },
+ { "format", NULL },
+ { "symbolsFile", NULL },
+ { "outputDirectory", NULL },
+ { "executableExtension", NULL },
+ { "coverageExtension", NULL },
+ { "target", NULL },
+ { "verbose", NULL },
+ { NULL, NULL }
</font> };
bool isTrue(const char *value)
<font color='#997700'>@@ -117,11 +120,13 @@
</font> {
GET_BOOL( "verbose", Verbose );
<font color='#880000'>- GET_STRING( "format", format );
- GET_STRING( "target", target );
- GET_STRING( "explanations", explanations );
- GET_STRING( "symbolsFile", symbolsFile );
- GET_STRING( "outputDirectory", outputDirectory );
</font><font color='#000088'>+ GET_STRING( "format", format );
+ GET_STRING( "target", target );
+ GET_STRING( "explanations", explanations );
+ GET_STRING( "symbolsFile", symbolsFile );
+ GET_STRING( "outputDirectory", outputDirectory );
+ GET_STRING( "executableExtension", executableExtension );
+ GET_STRING( "coverageExtension", coverageFileExtension );
</font>
// Now calculate some values
if ( coverageFileExtension )
<font color='#006600'>diff -u gcc-testing/rtems-coverage/do_coverage:1.58 gcc-testing/rtems-coverage/do_coverage:1.59
--- gcc-testing/rtems-coverage/do_coverage:1.58 Thu May 13 10:57:42 2010
+++ gcc-testing/rtems-coverage/do_coverage Wed May 19 09:02:21 2010
</font><font color='#997700'>@@ -340,15 +340,21 @@
</font> cd ${BASEDIR}/${BSP}-tests/
check_status $? "cd ${BSP}-tests"
<font color='#000088'>+ sed -e "s/@FORMAT@/${COVERAGE_FORMAT}/" \
+ -e "s/@TARGET@/${TARGET}/" \
+ -e "s,@EXPLANATIONS@,${COVBASE}/Explanations.txt," \
+ -e "s,@SYMBOLS_FILE@,${BASEDIR}/${BSP}-tests/rtems.syms," \
+ -e "s,@OUTPUT_DIRECTORY@,${results_dir}," \
+ -e "s/@EXECUTABLE_EXTENSION@/exe/" \
+ -e "s/@COVERAGE_EXTENSION@/${RTEMSEXT}.${COVEXT}/" \
+ <${COVBASE}/rtems_config.in \
+ >${BASEDIR}/${BSP}-tests/config
+ check_status $? "Unable to generate COVOAR config file"
+
</font> rm -rf ${results_dir}
mkdir ${results_dir}
${COVBASE}/covoar \
<font color='#880000'>- -O ${results_dir} \
- -T ${TARGET} \
- -f ${COVERAGE_FORMAT} \
- -s rtems.syms \
- -E ${COVBASE}/Explanations.txt \
- -e exe -c ${RTEMSEXT}.${COVEXT} \
</font><font color='#000088'>+ -C ${BASEDIR}/${BSP}-tests/config \
</font> *.exe > ${results_dir}/summary.txt
check_status $? "covoar failed"
<font color='#006600'>diff -u /dev/null gcc-testing/rtems-coverage/rtems_config.in:1.1
--- /dev/null Wed May 19 09:10:02 2010
+++ gcc-testing/rtems-coverage/rtems_config.in Wed May 19 09:02:21 2010
</font><font color='#997700'>@@ -0,0 +1,28 @@
</font><font color='#000088'>+#
+# COVOAR Template for RTEMS Coverage Analysis Runs
+#
+# $Id$
+#
+
+# This is the format of the trace or coverage files.
+format = @FORMAT@
+
+# This is the target we are analyzing.
+target = @TARGET@
+
+# This is the path to the explanations file.
+explanations = @EXPLANATIONS@
+
+# This is the path to the file which lists the symbols we want to analyze.
+symbolsFile = @SYMBOLS_FILE@
+
+# This is the name of the output directory.
+outputDirectory = @OUTPUT_DIRECTORY@
+
+# This is the extension on the coverage/trace files.
+coverageExtension = @COVERAGE_EXTENSION@
+
+# This is the extension on the executable files.
+executableExtension = @EXECUTABLE_EXTENSION@
+
+
</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>