Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: tools/testrunner/local/testsuite.py

Issue 1153073002: [test] Correctly merge expected test outcomes. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools/testrunner/objects/testcase.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 if outcome.startswith('Flags: '): 143 if outcome.startswith('Flags: '):
144 t.flags += outcome[7:].split() 144 t.flags += outcome[7:].split()
145 flaky = statusfile.IsFlaky(t.outcomes) 145 flaky = statusfile.IsFlaky(t.outcomes)
146 slow = statusfile.IsSlow(t.outcomes) 146 slow = statusfile.IsSlow(t.outcomes)
147 pass_fail = statusfile.IsPassOrFail(t.outcomes) 147 pass_fail = statusfile.IsPassOrFail(t.outcomes)
148 skip = False 148 skip = False
149 for rule in self.wildcards: 149 for rule in self.wildcards:
150 assert rule[-1] == '*' 150 assert rule[-1] == '*'
151 if testname.startswith(rule[:-1]): 151 if testname.startswith(rule[:-1]):
152 used_rules.add(rule) 152 used_rules.add(rule)
153 t.outcomes = self.wildcards[rule] 153 t.outcomes |= self.wildcards[rule]
154 if statusfile.DoSkip(t.outcomes): 154 if statusfile.DoSkip(t.outcomes):
155 skip = True 155 skip = True
156 break # "for rule in self.wildcards" 156 break # "for rule in self.wildcards"
157 flaky = flaky or statusfile.IsFlaky(t.outcomes) 157 flaky = flaky or statusfile.IsFlaky(t.outcomes)
158 slow = slow or statusfile.IsSlow(t.outcomes) 158 slow = slow or statusfile.IsSlow(t.outcomes)
159 pass_fail = pass_fail or statusfile.IsPassOrFail(t.outcomes) 159 pass_fail = pass_fail or statusfile.IsPassOrFail(t.outcomes)
160 if (skip or self._FilterFlaky(flaky, flaky_tests) 160 if (skip or self._FilterFlaky(flaky, flaky_tests)
161 or self._FilterSlow(slow, slow_tests) 161 or self._FilterSlow(slow, slow_tests)
162 or self._FilterPassFail(pass_fail, pass_fail_tests)): 162 or self._FilterPassFail(pass_fail, pass_fail_tests)):
163 continue # "for t in self.tests" 163 continue # "for t in self.tests"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 return (testcase.flags + ["--gtest_filter=" + testcase.path] + 270 return (testcase.flags + ["--gtest_filter=" + testcase.path] +
271 ["--gtest_random_seed=%s" % context.random_seed] + 271 ["--gtest_random_seed=%s" % context.random_seed] +
272 ["--gtest_print_time=0"] + 272 ["--gtest_print_time=0"] +
273 context.mode_flags) 273 context.mode_flags)
274 274
275 def VariantFlags(self, testcase, default_flags): 275 def VariantFlags(self, testcase, default_flags):
276 return [[]] 276 return [[]]
277 277
278 def shell(self): 278 def shell(self):
279 return self.name 279 return self.name
OLDNEW
« no previous file with comments | « no previous file | tools/testrunner/objects/testcase.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698