Ver código fonte

Generate explicit-failures-markup.xml with some non-ascii data to make sure we are able to handle it

[SVN r38071]
Aleksey Gurtovoy 19 anos atrás
pai
commit
0379dd9789

+ 5 - 3
tools/regression/xsl_reports/test/common.py

@@ -91,7 +91,8 @@ def make_test_log( xml_generator
 
 
 def make_expicit_failure_markup( num_of_libs, num_of_toolsets, num_of_tests ):
-    g = xml.sax.saxutils.XMLGenerator( open( "explicit-failures-markup.xml", "w" ) )
+    g = xml.sax.saxutils.XMLGenerator( open( "explicit-failures-markup.xml", "w" ), "utf-8" )
+    g.startDocument()
     g.startElement( "explicit-failures-markup", {} );
 
     # required toolsets
@@ -108,7 +109,7 @@ def make_expicit_failure_markup( num_of_libs, num_of_toolsets, num_of_tests ):
                 if i_toolset % 2 == 1:
                     g.startElement( "toolset", { "name": make_toolset_name( i_toolset ) } )
                     g.endElement( "toolset" )
-            g.startElement( "note", { "author": "T. Test" } )
+            g.startElement( "note", { "author": u"T. T\xe8st" } )
             g.characters( "Test note" )
             g.endElement( "note" )
             g.endElement( "mark-unusable" )
@@ -145,7 +146,7 @@ def make_expicit_failure_markup( num_of_libs, num_of_toolsets, num_of_tests ):
                     g.startElement( "toolset", { "name": make_toolset_name( 2 ) } )
                     g.endElement( "toolset" )
 
-                    g.startElement( "note", {  "author": "V. Annotated" } )
+                    g.startElement( "note", {  "author": u"V. Ann\xf3tated" } )
                     g.characters( "Some thoughtful note" )
                     g.endElement( "note" )
                     
@@ -156,6 +157,7 @@ def make_expicit_failure_markup( num_of_libs, num_of_toolsets, num_of_tests ):
             
         
     g.endElement( "explicit-failures-markup" )
+    g.endDocument()
 
 
 def make_expected_results( num_of_libs, num_of_toolsets, num_of_tests ):

+ 3 - 2
tools/regression/xsl_reports/test/generate_test_results.py

@@ -52,7 +52,8 @@ def make_test_results():
 
     for i_runner in range( 0, num_of_runners ):
         runner_id = "runner %02d" % i_runner
-        g = xml.sax.saxutils.XMLGenerator( open( os.path.join( results_directory, runner_id + ".xml" ), "w" ) )
+        g = xml.sax.saxutils.XMLGenerator( open( os.path.join( results_directory, runner_id + ".xml" ), "w" ), "utf-8" )
+        g.startDocument()
         if i_runner % 2:
             platform = "Win32"
         else:
@@ -129,7 +130,7 @@ def make_test_results():
                                               , show_run_output = show_run_output
                                               , variant = variant )
         g.endElement( "test-run" )
-
+        g.endDocument()
 
 
 

粤ICP备19079148号