|
|
Boost Testing : |
From: Niko Demmel (niko.demmel_at_[hidden])
Date: 2007-11-08 19:04:47
On 08/11/2007 19:16, Rene Rivera wrote:
> Niko Demmel wrote:
>
>> On 08/11/2007 03:42, Aleksey Gurtovoy wrote:
>>
>>> Beman Dawes wrote:
>>>
>>>
>>>> [...]
>>>> Yep.
>>>>
>>>> Try this:
>>>>
>>>> cd boost-trunk/tools/regression/xsl_reports/xsl/v2
>>>> grep cvs *.xsl
>>>>
>>>> You might also grep for sourceforge.
>>>>
>>>>
>>> .. and see http://article.gmane.org/gmane.comp.lib.boost.testing/5013
>>> for the instructions on how to verify your changes locally.
>>>
>>>
>> Thanks! I was about to ask about that. Unfortunately it isn't perfect,
>> since the parameters passed in the test case have not much to do with
>> the real library paths so I need to do a bit of (informed) guessing.
>>
>> The correct url to the svn depends on the source of the results. Am I
>> right assume that the only two possible "tag" parameters passed to the
>> results-page-generating script are "trunk" and "release" and that those
>> shood be mapped to the following?
>>
>> trunk -> http://svn.boost.org/svn/boost/trunk/
>> release -> http://svn.boost.org/svn/boost/branches/release/
>>
>
> Nope :-) Currently the two options used are --tag=trunk and
> --tag=branches/release.
Very neat :-)
> You can see how boost_wide_report.py is used in
> the build_results.sh script
> <http://svn.boost.org/trac/boost/browser/trunk/tools/regression/xsl_reports/build_results.sh>.
>
>
>
A patch which should fix the problem is attached. I tested it with the
test suite and it seems to work.
Could you please have a look at it, Rene?
Regards,
Niko
Index: boost-trunk/tools/regression/xsl_reports/boost_wide_report.py
===================================================================
--- boost-trunk/tools/regression/xsl_reports/boost_wide_report.py (Revision 40951)
+++ boost-trunk/tools/regression/xsl_reports/boost_wide_report.py (Arbeitskopie)
@@ -188,10 +188,11 @@
os.unlink( result )
class merge_xml_action( action ):
- def __init__( self, source, destination, expected_results_file, failures_markup_file ):
+ def __init__( self, source, destination, expected_results_file, failures_markup_file, tag ):
action.__init__( self, destination )
self.source_ = source
self.destination_ = destination
+ self.tag_ = tag
self.expected_results_file_ = expected_results_file
self.failures_markup_file_ = failures_markup_file
@@ -261,6 +262,7 @@
, {
"expected_results_file" : self.expected_results_file_
, "failures_markup_file": self.failures_markup_file_
+ , "source" : self.tag_
}
)
@@ -384,7 +386,7 @@
for a in actions:
a.run()
-def merge_xmls_task( source_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file ):
+def merge_xmls_task( source_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file, tag ):
utils.log( '' )
utils.log( 'merge_xmls_task: merging updated XMLs in "%s"...' % source_dir )
__log__ = 1
@@ -394,7 +396,8 @@
actions = [ merge_xml_action( os.path.join( processed_dir, os.path.basename( x ) )
, x
, expected_results_file
- , failures_markup_file ) for x in target_files ]
+ , failures_markup_file
+ , tag ) for x in target_files ]
for a in actions:
a.run()
@@ -487,7 +490,7 @@
ftp_task( ftp_site, site_path, incoming_dir )
unzip_archives_task( incoming_dir, processed_dir, utils.unzip )
- merge_xmls_task( incoming_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file )
+ merge_xmls_task( incoming_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file, tag )
make_links_task( merged_dir
, output_dir
, tag
Index: boost-trunk/tools/regression/xsl_reports/report.py
===================================================================
--- boost-trunk/tools/regression/xsl_reports/report.py (Revision 40951)
+++ boost-trunk/tools/regression/xsl_reports/report.py (Arbeitskopie)
@@ -71,7 +71,9 @@
, test_results_file
, xsl_path( 'add_expected_results.xsl', v2 )
, extended_test_results
- , { 'expected_results_file': expected_results_file, 'failures_markup_file' : failures_markup_file }
+ , { 'expected_results_file': expected_results_file
+ , 'failures_markup_file' : failures_markup_file
+ , 'source' : tag }
)
links = os.path.join( output_dir, 'links.html' )
Index: boost-trunk/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl
===================================================================
--- boost-trunk/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl (Revision 40951)
+++ boost-trunk/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl (Arbeitskopie)
@@ -23,6 +23,7 @@
<xsl:param name="expected_results_file"/>
<xsl:param name="failures_markup_file"/>
+ <xsl:param name="source"/>
<xsl:variable name="expected_results" select="document( $expected_results_file )" />
<func:function name="meta:is_test_log_complete">
@@ -168,8 +169,8 @@
<note>
<span class="auto-note">
This test case was explicitly marked up in
- <a href="http://cvs.sourceforge.net/viewcvs.py/boost/boost/status/explicit-failures-markup.xml">
- status/explicit-failures-markup.xml</a> file in the Boost CVS as "expected to fail",
+ <a href="http://svn.boost.org/svn/boost/{$source}/status/explicit-failures-markup.xml">
+ status/explicit-failures-markup.xml</a> file in the Boost SVN as "expected to fail",
but is passing. Please consult the notes/output below for more details.
</span>
</note>
@@ -189,8 +190,8 @@
<note>
<span class="auto-note">
This failure was explicitly marked as expected in
- <a href="http://cvs.sourceforge.net/viewcvs.py/boost/boost/status/explicit-failures-markup.xml">
- status/explicit-failures-markup.xml</a> file in the Boost CVS.
+ <a href="http://svn.boost.org/svn/boost/{$source}/status/explicit-failures-markup.xml">
+ status/explicit-failures-markup.xml</a> file in the Boost SVN.
Please contact the library author(s)/maintainer(s) for the explanation of this markup.
</span>
</note>
Index: boost-trunk/tools/regression/xsl_reports/xsl/v2/result_page.xsl
===================================================================
--- boost-trunk/tools/regression/xsl_reports/xsl/v2/result_page.xsl (Revision 40951)
+++ boost-trunk/tools/regression/xsl_reports/xsl/v2/result_page.xsl (Arbeitskopie)
@@ -595,7 +595,7 @@
<xsl:variable name="test_header">
<td class="test-name">
- <a href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/{$test_program}" class="test-link" target="_top">
+ <a href="http://svn.boost.org/svn/boost/{$source}/{$test_program}" class="test-link" target="_top">
<xsl:value-of select="$test_name"/>
</a>
</td>
Index: boost-trunk/tools/regression/xsl_reports/xsl/v2/issues_page.xsl
===================================================================
--- boost-trunk/tools/regression/xsl_reports/xsl/v2/issues_page.xsl (Revision 40951)
+++ boost-trunk/tools/regression/xsl_reports/xsl/v2/issues_page.xsl (Arbeitskopie)
@@ -178,7 +178,7 @@
<xsl:variable name="test_program" select="$library_tests[@test-name = $test_name]/@test-program"/>
<tr>
<td class="test-name">
- <a href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/{$test_program}" class="test-link" target="_top">
+ <a href="http://svn.boost.org/svn/boost/{$source}/{$test_program}" class="test-link" target="_top">
<xsl:value-of select="$test_name"/>
</a>
</td>