@@ -77,7 +77,6 @@ def __init__(self, cases, flaky_tests_mode):
7777 self .failed = [ ]
7878 self .flaky_failed = [ ]
7979 self .crashed = 0
80- self .flaky_crashed = 0
8180 self .lock = threading .Lock ()
8281 self .shutdown_event = threading .Event ()
8382
@@ -155,8 +154,6 @@ def RunSingle(self, parallel, thread_id):
155154 if output .UnexpectedOutput ():
156155 if FLAKY in output .test .outcomes and self .flaky_tests_mode == DONTCARE :
157156 self .flaky_failed .append (output )
158- if output .HasCrashed ():
159- self .flaky_crashed += 1
160157 else :
161158 self .failed .append (output )
162159 if output .HasCrashed ():
@@ -541,9 +538,6 @@ def UnexpectedOutput(self):
541538 outcome = PASS
542539 return not outcome in self .test .outcomes
543540
544- def HasPreciousOutput (self ):
545- return self .UnexpectedOutput () and self .store_unexpected_output
546-
547541 def HasCrashed (self ):
548542 if utils .IsWindows ():
549543 return 0x80000000 & self .output .exit_code and not (0x3FFFFF00 & self .output .exit_code )
@@ -770,11 +764,6 @@ def GetName(self):
770764 return self .name
771765
772766
773- # Use this to run several variants of the tests, e.g.:
774- # VARIANT_FLAGS = [[], ['--always_compact', '--noflush_code']]
775- VARIANT_FLAGS = [[]]
776-
777-
778767class TestRepository (TestSuite ):
779768
780769 def __init__ (self , path ):
@@ -793,10 +782,6 @@ def GetConfiguration(self, context):
793782 (file , pathname , description ) = imp .find_module ('testcfg' , [ self .path ])
794783 module = imp .load_module ('testcfg' , file , pathname , description )
795784 self .config = module .GetConfiguration (context , self .path )
796- if hasattr (self .config , 'additional_flags' ):
797- self .config .additional_flags += context .node_args
798- else :
799- self .config .additional_flags = context .node_args
800785 finally :
801786 if file :
802787 file .close ()
@@ -806,13 +791,11 @@ def GetBuildRequirements(self, path, context):
806791 return self .GetConfiguration (context ).GetBuildRequirements ()
807792
808793 def AddTestsToList (self , result , current_path , path , context , arch , mode ):
809- for v in VARIANT_FLAGS :
810- tests = self .GetConfiguration (context ).ListTests (current_path , path ,
811- arch , mode )
812- for t in tests : t .variant_flags = v
813- result += tests
814- for i in range (1 , context .repeat ):
815- result += copy .deepcopy (tests )
794+ tests = self .GetConfiguration (context ).ListTests (current_path , path ,
795+ arch , mode )
796+ result += tests
797+ for i in range (1 , context .repeat ):
798+ result += copy .deepcopy (tests )
816799
817800 def GetTestStatus (self , context , sections , defs ):
818801 self .GetConfiguration (context ).GetTestStatus (sections , defs )
@@ -848,12 +831,6 @@ def GetTestStatus(self, context, sections, defs):
848831 test .GetTestStatus (context , sections , defs )
849832
850833
851- SUFFIX = {
852- 'debug' : '_g' ,
853- 'release' : '' }
854- FLAGS = {
855- 'debug' : ['--enable-slow-asserts' , '--debug-code' , '--verify-heap' ],
856- 'release' : []}
857834TIMEOUT_SCALEFACTOR = {
858835 'armv6' : { 'debug' : 12 , 'release' : 3 }, # The ARM buildbots are slow.
859836 'arm' : { 'debug' : 8 , 'release' : 2 },
@@ -870,7 +847,6 @@ def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail,
870847 self .workspace = workspace
871848 self .buildspace = buildspace
872849 self .verbose = verbose
873- self .vm_root = vm
874850 self .node_args = args
875851 self .expect_fail = expect_fail
876852 self .timeout = timeout
@@ -899,9 +875,6 @@ def GetVm(self, arch, mode):
899875
900876 return name
901877
902- def GetVmFlags (self , testcase , mode ):
903- return testcase .variant_flags + FLAGS [mode ]
904-
905878 def GetTimeout (self , mode ):
906879 return self .timeout * TIMEOUT_SCALEFACTOR [ARCH_GUESS or 'ia32' ][mode ]
907880
@@ -986,18 +959,6 @@ def IsEmpty(self):
986959 return len (self .elms ) == 0
987960
988961
989- class Everything (Set ):
990-
991- def Intersect (self , that ):
992- return that
993-
994- def Union (self , that ):
995- return self
996-
997- def IsEmpty (self ):
998- return False
999-
1000-
1001962class Nothing (Set ):
1002963
1003964 def Intersect (self , that ):
0 commit comments