[test] Fix joining FAIL expectations in status files

tools/testrunner/local/statusfile.py

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 88 matching lines @@
     mapped = DEFS[new]
     if type(mapped) == list:
       for m in mapped:
         _AddOutcome(result, m)
     elif type(mapped) == str:
       _AddOutcome(result, mapped)
   else:
     result.add(new)
 
 
+def _JoinsPassAndFail(outcomes1, outcomes2):
+  """Indicates if we join PASS and FAIL from two different outcome sets and
+  the first doesn't already contain both.
+  """
+  return (
+      PASS in outcomes1 and
+      not FAIL in outcomes1 and
+      FAIL in outcomes2
+  )
+
 def _ParseOutcomeList(rule, outcomes, target_dict, variables):
   result = set([])
   if type(outcomes) == str:
     outcomes = [outcomes]
   for item in outcomes:
     if type(item) == str:
       _AddOutcome(result, item)
     elif type(item) == list:
       if not eval(item[0], variables): continue
       for outcome in item[1:]:
         assert type(outcome) == str
         _AddOutcome(result, outcome)
     else:
       assert False
   if len(result) == 0: return
   if rule in target_dict:
+    # A FAIL without PASS in one rule has always precedence over a single
+    # PASS (without FAIL) in another. Otherwise the default PASS expectation
+    # in a rule with a modifier (e.g. PASS, SLOW) would be joined to a FAIL
+    # from another rule (which intended to mark a test as FAIL and not as
+    # PASS and FAIL).
+    if _JoinsPassAndFail(target_dict[rule], result):
+      target_dict[rule] -= set([PASS])
+    if _JoinsPassAndFail(result, target_dict[rule]):
+      result -= set([PASS])
     target_dict[rule] |= result
   else:
     target_dict[rule] = result
 
 
 def ReadContent(path):
   with open(path) as f:
     global KEYWORDS
     return eval(f.read(), KEYWORDS)
 
@@ skipping 37 matching lines @@
       for rule in section:
         _assert(type(rule) == str, "Rule key must be a string")
         _assert(not rule.startswith(root_prefix),
                 "Suite name prefix must not be used in rule keys")
         _assert(not rule.endswith('.js'),
                 ".js extension must not be used in rule keys.")
     return status["success"]
   except Exception as e:
     print e
     return False