more code merge
This commit is contained in:
		
							parent
							
								
									325bdd33f3
								
							
						
					
					
						commit
						d54b4ce548
					
				@ -41,7 +41,6 @@ from xml.dom import minidom, Node
 | 
				
			|||||||
import gtest_test_utils
 | 
					import gtest_test_utils
 | 
				
			||||||
import gtest_xml_test_utils
 | 
					import gtest_xml_test_utils
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
GTEST_FILTER_FLAG = '--gtest_filter'
 | 
					GTEST_FILTER_FLAG = '--gtest_filter'
 | 
				
			||||||
GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
 | 
					GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'
 | 
				
			||||||
GTEST_OUTPUT_FLAG = '--gtest_output'
 | 
					GTEST_OUTPUT_FLAG = '--gtest_output'
 | 
				
			||||||
@ -228,8 +227,7 @@ class GTestXMLOutputUnitTest(gtest_xml_test_utils.GTestXMLTestCase):
 | 
				
			|||||||
        'gtest_no_test_unittest')
 | 
					        'gtest_no_test_unittest')
 | 
				
			||||||
    try:
 | 
					    try:
 | 
				
			||||||
      os.remove(output_file)
 | 
					      os.remove(output_file)
 | 
				
			||||||
    except OSError:
 | 
					    except OSError, e:
 | 
				
			||||||
      e = sys.exc_info()[1]
 | 
					 | 
				
			||||||
      if e.errno != errno.ENOENT:
 | 
					      if e.errno != errno.ENOENT:
 | 
				
			||||||
        raise
 | 
					        raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user