diff options
Diffstat (limited to 'chromium/v8/tools/testrunner/local/statusfile.py')
| -rw-r--r-- | chromium/v8/tools/testrunner/local/statusfile.py | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/chromium/v8/tools/testrunner/local/statusfile.py b/chromium/v8/tools/testrunner/local/statusfile.py index 1d30fe3d3c1..e290122fb79 100644 --- a/chromium/v8/tools/testrunner/local/statusfile.py +++ b/chromium/v8/tools/testrunner/local/statusfile.py @@ -26,14 +26,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# These imports are required for the on-demand conversion from -# old to new status file format. -from os.path import exists -from os.path import getmtime - -from . import old_statusfile - - # These outcomes can occur in a TestCase's outcomes list: SKIP = "SKIP" FAIL = "FAIL" @@ -43,6 +35,7 @@ TIMEOUT = "TIMEOUT" CRASH = "CRASH" SLOW = "SLOW" FLAKY = "FLAKY" +NO_VARIANTS = "NO_VARIANTS" # These are just for the status files and are mapped below in DEFS: FAIL_OK = "FAIL_OK" PASS_OR_FAIL = "PASS_OR_FAIL" @@ -51,7 +44,7 @@ ALWAYS = "ALWAYS" KEYWORDS = {} for key in [SKIP, FAIL, PASS, OKAY, TIMEOUT, CRASH, SLOW, FLAKY, FAIL_OK, - PASS_OR_FAIL, ALWAYS]: + NO_VARIANTS, PASS_OR_FAIL, ALWAYS]: KEYWORDS[key] = key DEFS = {FAIL_OK: [FAIL, OKAY], @@ -60,12 +53,21 @@ DEFS = {FAIL_OK: [FAIL, OKAY], # Support arches, modes to be written as keywords instead of strings. VARIABLES = {ALWAYS: True} for var in ["debug", "release", "android_arm", "android_ia32", "arm", "ia32", - "mipsel", "x64", "nacl_ia32", "nacl_x64"]: + "mipsel", "x64", "nacl_ia32", "nacl_x64", "macos", "windows", + "linux"]: VARIABLES[var] = var def DoSkip(outcomes): - return SKIP in outcomes or SLOW in outcomes + return SKIP in outcomes + + +def IsSlow(outcomes): + return SLOW in outcomes + + +def OnlyStandardVariant(outcomes): + return NO_VARIANTS in outcomes def IsFlaky(outcomes): @@ -116,18 +118,6 @@ def _ParseOutcomeList(rule, outcomes, target_dict, variables): def ReadStatusFile(path, variables): - # As long as the old-format .status files are authoritative, just - # create the converted version on demand and cache it to speed up - # subsequent runs. - if path.endswith(".status"): - newpath = path + "2" - if not exists(newpath) or getmtime(newpath) < getmtime(path): - print "Converting status file." - converted = old_statusfile.ConvertNotation(path).GetOutput() - with open(newpath, 'w') as f: - f.write(converted) - path = newpath - with open(path) as f: global KEYWORDS contents = eval(f.read(), KEYWORDS) |