Exclude XFA-only corpus from non-xfa and roll corpus

testing/tools/suppressor.py

 #!/usr/bin/env python
 # Copyright 2015 The PDFium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 import common
 
 class Suppressor:
   def __init__(self, finder, feature_string):
     feature_vector = feature_string.strip().split(",")
-    v8_option = ["nov8", "v8"]["V8" in feature_vector]
-    xfa_option = ["noxfa", "xfa"]["XFA" in feature_vector]
+    self.has_v8 = "V8" in feature_vector
+    self.has_xfa = "XFA" in feature_vector
+    v8_option = ["nov8", "v8"][self.has_v8]

[Lei Zhang, 2016/04/18 23:57:25]

how about the more common way to do ternary operators in Python?

v8_option = "v8" if self.has_v8 else "nov8"

[Tom Sepez, 2016/04/19 00:04:47]

Done.

+    xfa_option = ["noxfa", "xfa"][self.has_xfa]
     with open(os.path.join(finder.TestingDir(), 'SUPPRESSIONS')) as f:
       self.suppression_set = set(self._FilterSuppressions(
         common.os_name(), v8_option, xfa_option, self._ExtractSuppressions(f)))
 
   def _ExtractSuppressions(self, f):
     return [y.split(' ') for y in
             [x.split('#')[0].strip() for x in
              f.readlines()] if y]
 
   def _FilterSuppressions(self, os, js, xfa, unfiltered_list):
     return [x[0] for x in unfiltered_list
             if self._MatchSuppression(x, os, js, xfa)]
 
   def _MatchSuppression(self, item, os, js, xfa):
     os_column = item[1].split(",");
     js_column = item[2].split(",");
     xfa_column = item[3].split(",");
     return (('*' in os_column or os in os_column) and
             ('*' in js_column or js in js_column) and
             ('*' in xfa_column or xfa in xfa_column))
 
   def IsSuppressed(self, input_filename):
     if input_filename in self.suppression_set:
       print "%s is suppressed" % input_filename
       return True
     return False
+
+  def IsExecutionSuppressed(self, input_filepath):

[Lei Zhang, 2016/04/18 23:57:26]

The difference between this and IsSuppressed() may not be obvious to readers.
Maybe IsSuppressed() should be renamed IsErrorResultSuppressed() ?

[Tom Sepez, 2016/04/19 00:04:47]

Done.

+    return "xfa_specific" in input_filepath and not self.has_xfa

[Lei Zhang, 2016/04/18 23:57:26]

Do you want to print a message to indicate suppression, like with IsSuppressed()
?