[test] Fully deprecate NO_IGNITION directive.

R=machenbach@chromium.org

Review-Url: https://codereview.chromium.org/2228853002
Cr-Commit-Position: refs/heads/master@{#38494}

test/intl/intl.status

@@ -31,9 +31,9 @@
   'overrides/caching': [PASS, FAIL],
 }],  # ALWAYS
 
-['arch == arm64 and mode == debug and simulator_run == True', {
-  # Ignition.
-  'date-format/timezone': [PASS, ['no_snap and mode == debug', NO_IGNITION]],
-  'number-format/check-digit-ranges': [PASS, ['no_snap and mode == debug', NO_IGNITION]],
-}],  # 'arch == arm64 and mode == debug and simulator_run == True'
+['arch == arm64 and mode == debug and simulator_run == True and variant == ignition', {
+  # Ignition on ARM64 simulator in debug mode.
+  'date-format/timezone': [PASS, ['no_snap', SKIP]],
+  'number-format/check-digit-ranges': [PASS, ['no_snap', SKIP]],
+}],  # 'arch == arm64 and mode == debug and simulator_run == True and variant == ignition'
 ]

test/webkit/webkit.status

@@ -105,11 +105,11 @@
 }],  # 'gc_stress == True and mode == debug'
 
 ##############################################################################
-['msan', {
+['variant == ignition and msan', {
   # TODO(mythria,4680): Too slow and timeout on ignition.
-  'dfg-double-vote-fuzz': [PASS, NO_IGNITION],
-  'dfg-int-overflow-in-loop': [PASS, NO_IGNITION],
-}],  # msan
+  'dfg-double-vote-fuzz': [SKIP],
+  'dfg-int-overflow-in-loop': [SKIP],
+}],  # variant == ignition and msan
 
 ##############################################################################
 ['variant == turbofan', {

tools/testrunner/local/statusfile.py

@@ -40,7 +40,6 @@ TIMEOUT = "TIMEOUT"
 CRASH = "CRASH"
 SLOW = "SLOW"
 FAST_VARIANTS = "FAST_VARIANTS"
-NO_IGNITION = "NO_IGNITION"
 NO_VARIANTS = "NO_VARIANTS"
 # These are just for the status files and are mapped below in DEFS:
 FAIL_OK = "FAIL_OK"
@@ -51,8 +50,7 @@ ALWAYS = "ALWAYS"
 
 KEYWORDS = {}
 for key in [SKIP, FAIL, PASS, OKAY, TIMEOUT, CRASH, SLOW, FAIL_OK,
-            FAST_VARIANTS, NO_IGNITION, NO_VARIANTS, PASS_OR_FAIL, FAIL_SLOPPY,
-            ALWAYS]:
+            FAST_VARIANTS, NO_VARIANTS, PASS_OR_FAIL, FAIL_SLOPPY, ALWAYS]:
   KEYWORDS[key] = key
 
 DEFS = {FAIL_OK: [FAIL, OKAY],
@@ -80,10 +78,6 @@ def IsSlow(outcomes):
   return SLOW in outcomes
 
 
-def NoIgnitionVariant(outcomes):
-  return NO_IGNITION in outcomes
-
-
 def OnlyStandardVariant(outcomes):
   return NO_VARIANTS in outcomes
 

tools/testrunner/local/testsuite.py

@@ -38,7 +38,6 @@ from variants import ALL_VARIANTS, ALL_VARIANT_FLAGS, FAST_VARIANT_FLAGS
 
 FAST_VARIANTS = set(["default", "turbofan"])
 STANDARD_VARIANT = set(["default"])
-IGNITION_VARIANT = set(["ignition"])
 
 
 class VariantGenerator(object):
@@ -55,8 +54,6 @@ class VariantGenerator(object):
         return self.standard_variant
       if statusfile.OnlyFastVariants(testcase.outcomes):
         result = self.fast_variants
-      if statusfile.NoIgnitionVariant(testcase.outcomes):
-        result = result - IGNITION_VARIANT
     return result
 
   def GetFlagSets(self, testcase, variant):