@@ -78,7 +78,6 @@ def __init__(self, cases, flaky_tests_mode):
78
78
self .failed = [ ]
79
79
self .flaky_failed = [ ]
80
80
self .crashed = 0
81
- self .flaky_crashed = 0
82
81
self .lock = threading .Lock ()
83
82
self .shutdown_event = threading .Event ()
84
83
@@ -156,8 +155,6 @@ def RunSingle(self, parallel, thread_id):
156
155
if output .UnexpectedOutput ():
157
156
if FLAKY in output .test .outcomes and self .flaky_tests_mode == DONTCARE :
158
157
self .flaky_failed .append (output )
159
- if output .HasCrashed ():
160
- self .flaky_crashed += 1
161
158
else :
162
159
self .failed .append (output )
163
160
if output .HasCrashed ():
@@ -576,9 +573,6 @@ def UnexpectedOutput(self):
576
573
outcome = PASS
577
574
return not outcome in self .test .outcomes
578
575
579
- def HasPreciousOutput (self ):
580
- return self .UnexpectedOutput () and self .store_unexpected_output
581
-
582
576
def HasCrashed (self ):
583
577
if utils .IsWindows ():
584
578
return 0x80000000 & self .output .exit_code and not (0x3FFFFF00 & self .output .exit_code )
@@ -805,11 +799,6 @@ def GetName(self):
805
799
return self .name
806
800
807
801
808
- # Use this to run several variants of the tests, e.g.:
809
- # VARIANT_FLAGS = [[], ['--always_compact', '--noflush_code']]
810
- VARIANT_FLAGS = [[]]
811
-
812
-
813
802
class TestRepository (TestSuite ):
814
803
815
804
def __init__ (self , path ):
@@ -828,10 +817,6 @@ def GetConfiguration(self, context):
828
817
(file , pathname , description ) = imp .find_module ('testcfg' , [ self .path ])
829
818
module = imp .load_module ('testcfg' , file , pathname , description )
830
819
self .config = module .GetConfiguration (context , self .path )
831
- if hasattr (self .config , 'additional_flags' ):
832
- self .config .additional_flags += context .node_args
833
- else :
834
- self .config .additional_flags = context .node_args
835
820
finally :
836
821
if file :
837
822
file .close ()
@@ -841,13 +826,11 @@ def GetBuildRequirements(self, path, context):
841
826
return self .GetConfiguration (context ).GetBuildRequirements ()
842
827
843
828
def AddTestsToList (self , result , current_path , path , context , arch , mode ):
844
- for v in VARIANT_FLAGS :
845
- tests = self .GetConfiguration (context ).ListTests (current_path , path ,
846
- arch , mode )
847
- for t in tests : t .variant_flags = v
848
- result += tests
849
- for i in range (1 , context .repeat ):
850
- result += copy .deepcopy (tests )
829
+ tests = self .GetConfiguration (context ).ListTests (current_path , path ,
830
+ arch , mode )
831
+ result += tests
832
+ for i in range (1 , context .repeat ):
833
+ result += copy .deepcopy (tests )
851
834
852
835
def GetTestStatus (self , context , sections , defs ):
853
836
self .GetConfiguration (context ).GetTestStatus (sections , defs )
@@ -883,12 +866,6 @@ def GetTestStatus(self, context, sections, defs):
883
866
test .GetTestStatus (context , sections , defs )
884
867
885
868
886
- SUFFIX = {
887
- 'debug' : '_g' ,
888
- 'release' : '' }
889
- FLAGS = {
890
- 'debug' : ['--enable-slow-asserts' , '--debug-code' , '--verify-heap' ],
891
- 'release' : []}
892
869
TIMEOUT_SCALEFACTOR = {
893
870
'armv6' : { 'debug' : 12 , 'release' : 3 }, # The ARM buildbots are slow.
894
871
'arm' : { 'debug' : 8 , 'release' : 2 },
@@ -906,7 +883,6 @@ def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail,
906
883
self .workspace = workspace
907
884
self .buildspace = buildspace
908
885
self .verbose = verbose
909
- self .vm_root = vm
910
886
self .node_args = args
911
887
self .expect_fail = expect_fail
912
888
self .timeout = timeout
@@ -936,9 +912,6 @@ def GetVm(self, arch, mode):
936
912
937
913
return name
938
914
939
- def GetVmFlags (self , testcase , mode ):
940
- return testcase .variant_flags + FLAGS [mode ]
941
-
942
915
def GetTimeout (self , mode ):
943
916
return self .timeout * TIMEOUT_SCALEFACTOR [ARCH_GUESS or 'ia32' ][mode ]
944
917
@@ -1036,18 +1009,6 @@ def IsEmpty(self):
1036
1009
return len (self .elms ) == 0
1037
1010
1038
1011
1039
- class Everything (Set ):
1040
-
1041
- def Intersect (self , that ):
1042
- return that
1043
-
1044
- def Union (self , that ):
1045
- return self
1046
-
1047
- def IsEmpty (self ):
1048
- return False
1049
-
1050
-
1051
1012
class Nothing (Set ):
1052
1013
1053
1014
def Intersect (self , that ):
0 commit comments