Aleksey Gurtovoy 21 лет назад
Родитель
Сommit
44e1cbad4e

+ 6 - 3
tools/regression/xsl_reports/report.py

@@ -304,9 +304,12 @@ def accept_args( args ):
     if not options.has_key( '--results-dir' ):
          options[ '--results-dir' ] = options[ '--locate-root' ]
 
-    if options.has_key( '--v2' ) and not options.has_key( '--results-prefix' ):
-        options[ '--results-prefix' ] = 'all'
-        
+    if not options.has_key( '--results-prefix' ):
+        if options.has_key( '--v2' ):
+            options[ '--results-prefix' ] = 'all'
+        else:
+            options[ '--results-prefix' ] = ''
+    
     return ( 
           options[ '--locate-root' ]
         , options[ '--tag' ]

+ 4 - 3
tools/regression/xsl_reports/utils/libxslt.py

@@ -11,9 +11,10 @@ def libxslt( log, xml_file, xsl_file, output_file, parameters = None ):
     transform_command = transform_command + ' -o ' + '%s' % output_file
 
     if parameters is not None:
-         for i in parameters: 
-             parameters[i] = parameters[i].replace( '\\', '/' )
-             transform_command = transform_command + ' --param %s "\'%s\'" ' % ( i, parameters[ i ] )
+         for i in parameters:
+             if parameters[i]:
+                 parameters[i] = parameters[i].replace( '\\', '/' )
+                 transform_command = transform_command + ' --param %s "\'%s\'" ' % ( i, parameters[ i ] )
 
     transform_command = transform_command + ' "%s" ' % xsl_file
     transform_command = transform_command + ' "%s" ' % xml_file

粤ICP备19079148号