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

rtems-vc at rtems.org rtems-vc at rtems.org
Wed May 19 14:10:02 UTC 2010


 *joel*:
2010-05-19	Joel Sherrill <joel.sherrilL at 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.

M  1.264  rtems-coverage/ChangeLog
M   1.28  rtems-coverage/covoar.cc
M   1.59  rtems-coverage/do_coverage
A    1.1  rtems-coverage/rtems_config.in

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
@@ -1,3 +1,10 @@
+2010-05-19	Joel Sherrill <joel.sherrilL at 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.
+
 2010-05-18	Joel Sherrill <joel.sherrill at oarcorp.com>
 
 	* ObjdumpProcessor.cc: Now read dlinfo from file.

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
@@ -29,14 +29,14 @@
 /*
  *  Variables to control general behavior
  */
-char*                                coverageFileExtension = NULL;
+const char*                          coverageFileExtension = NULL;
 std::list<std::string>               coverageFileNames;
 int                                  coverageExtensionLength = 0;
 Coverage::CoverageFormats_t          coverageFormat;
 Coverage::CoverageReaderBase*        coverageReader = NULL;
 const char*                          dynamicLibrary = NULL;
 char*                                executable = NULL;
-char*                                executableExtension = NULL;
+const char*                          executableExtension = NULL;
 int                                  executableExtensionLength = 0;
 std::list<Coverage::ExecutableInfo*> executablesToAnalyze;
 const char*                          explanations = NULL;
@@ -83,12 +83,15 @@
 Configuration::FileReader *CoverageConfiguration;
 
 Configuration::Options_t Options[] = {
-  { "explanations", NULL },
-  { "format",       NULL },
-  { "symbolsFile ", NULL },
-  { "target",       NULL },
-  { "verbose",      NULL },
-  { NULL,           NULL }
+  { "explanations",         NULL },
+  { "format",               NULL },
+  { "symbolsFile",          NULL },
+  { "outputDirectory",      NULL },
+  { "executableExtension",  NULL },
+  { "coverageExtension",    NULL },
+  { "target",               NULL },
+  { "verbose",              NULL },
+  { NULL,                   NULL }
 };
 
 bool isTrue(const char *value)
@@ -117,11 +120,13 @@
 {
   GET_BOOL( "verbose", Verbose );
 
-  GET_STRING( "format",           format );
-  GET_STRING( "target",           target );
-  GET_STRING( "explanations",     explanations );
-  GET_STRING( "symbolsFile",      symbolsFile );
-  GET_STRING( "outputDirectory",  outputDirectory );
+  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 );
 
   // Now calculate some values
   if ( coverageFileExtension )

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
@@ -340,15 +340,21 @@
   cd ${BASEDIR}/${BSP}-tests/
   check_status $? "cd ${BSP}-tests"
 
+  sed -e "s/@FORMAT@/${COVERAGE_FORMAT}/" \
+      -e "s/@TARGET@/${TARGET}/" \
+      -e "s, at EXPLANATIONS@,${COVBASE}/Explanations.txt," \
+      -e "s, at SYMBOLS_FILE@,${BASEDIR}/${BSP}-tests/rtems.syms," \
+      -e "s, at 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"
+
   rm -rf ${results_dir}
   mkdir  ${results_dir}
   ${COVBASE}/covoar \
-    -O ${results_dir} \
-    -T ${TARGET} \
-    -f ${COVERAGE_FORMAT} \
-    -s rtems.syms \
-    -E ${COVBASE}/Explanations.txt \
-    -e exe -c ${RTEMSEXT}.${COVEXT} \
+    -C ${BASEDIR}/${BSP}-tests/config \
     *.exe > ${results_dir}/summary.txt
   check_status $? "covoar failed"
 

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
@@ -0,0 +1,28 @@
+#
+#  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@
+
+



--

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/20100519/a7a55c1f/attachment.html>


More information about the vc mailing list