Skip to content

Commit 95d13d5

Browse files
TrottMylesBorins
authored andcommitted
tools: remove unused code from test.py
PR-URL: #12806 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 74dc86d commit 95d13d5

1 file changed

Lines changed: 5 additions & 44 deletions

File tree

‎tools/test.py‎

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -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
ifoutput.UnexpectedOutput():
156155
ifFLAKYinoutput.test.outcomesandself.flaky_tests_mode==DONTCARE:
157156
self.flaky_failed.append(output)
158-
ifoutput.HasCrashed():
159-
self.flaky_crashed+=1
160157
else:
161158
self.failed.append(output)
162159
ifoutput.HasCrashed():
@@ -541,9 +538,6 @@ def UnexpectedOutput(self):
541538
outcome=PASS
542539
returnnotoutcomeinself.test.outcomes
543540

544-
defHasPreciousOutput(self):
545-
returnself.UnexpectedOutput() andself.store_unexpected_output
546-
547541
defHasCrashed(self):
548542
ifutils.IsWindows():
549543
return0x80000000&self.output.exit_codeandnot (0x3FFFFF00&self.output.exit_code)
@@ -770,11 +764,6 @@ def GetName(self):
770764
returnself.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-
778767
classTestRepository(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-
ifhasattr(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
iffile:
802787
file.close()
@@ -806,13 +791,11 @@ def GetBuildRequirements(self, path, context):
806791
returnself.GetConfiguration(context).GetBuildRequirements()
807792

808793
defAddTestsToList(self, result, current_path, path, context, arch, mode):
809-
forvinVARIANT_FLAGS:
810-
tests=self.GetConfiguration(context).ListTests(current_path, path,
811-
arch, mode)
812-
fortintests: t.variant_flags=v
813-
result+=tests
814-
foriinrange(1, context.repeat):
815-
result+=copy.deepcopy(tests)
794+
tests=self.GetConfiguration(context).ListTests(current_path, path,
795+
arch, mode)
796+
result+=tests
797+
foriinrange(1, context.repeat):
798+
result+=copy.deepcopy(tests)
816799

817800
defGetTestStatus(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' : []}
857834
TIMEOUT_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
returnname
901877

902-
defGetVmFlags(self, testcase, mode):
903-
returntestcase.variant_flags+FLAGS[mode]
904-
905878
defGetTimeout(self, mode):
906879
returnself.timeout*TIMEOUT_SCALEFACTOR[ARCH_GUESSor'ia32'][mode]
907880

@@ -986,18 +959,6 @@ def IsEmpty(self):
986959
returnlen(self.elms) ==0
987960

988961

989-
classEverything(Set):
990-
991-
defIntersect(self, that):
992-
returnthat
993-
994-
defUnion(self, that):
995-
returnself
996-
997-
defIsEmpty(self):
998-
returnFalse
999-
1000-
1001962
classNothing(Set):
1002963

1003964
defIntersect(self, that):

0 commit comments

Comments
 (0)