summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testing/SUPPRESSIONS_IMAGE_DIFF (renamed from testing/SUPPRESSIONS_PIXEL)2
-rwxr-xr-xtesting/tools/suppressor.py11
-rw-r--r--testing/tools/test_runner.py2
3 files changed, 8 insertions, 7 deletions
diff --git a/testing/SUPPRESSIONS_PIXEL b/testing/SUPPRESSIONS_IMAGE_DIFF
index d1a576500e..cdb2d66f93 100644
--- a/testing/SUPPRESSIONS_PIXEL
+++ b/testing/SUPPRESSIONS_IMAGE_DIFF
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
-# List of tests to have pixel diff tests skipped, one per line.
+# List of tests to have image diff tests skipped, one per line.
# There are four space-separated columns per line
# Each column (except column 0) can contain a comma-separated list of values.
#
diff --git a/testing/tools/suppressor.py b/testing/tools/suppressor.py
index be03e21516..2b4b5d3f08 100755
--- a/testing/tools/suppressor.py
+++ b/testing/tools/suppressor.py
@@ -13,8 +13,9 @@ class Suppressor:
self.has_v8 = "V8" in feature_vector
self.has_xfa = "XFA" in feature_vector
self.suppression_set = self._LoadSuppressedSet('SUPPRESSIONS', finder)
- self.pixel_suppression_set = self._LoadSuppressedSet('SUPPRESSIONS_PIXEL',
- finder)
+ self.image_suppression_set = self._LoadSuppressedSet(
+ 'SUPPRESSIONS_IMAGE_DIFF',
+ finder)
def _LoadSuppressedSet(self, suppressions_filename, finder):
v8_option = "v8" if self.has_v8 else "nov8"
@@ -52,8 +53,8 @@ class Suppressor:
return True
return False
- def IsPixelDiffSuppressed(self, input_filename):
- if input_filename in self.pixel_suppression_set:
- print "%s is pixel suppressed" % input_filename
+ def IsImageDiffSuppressed(self, input_filename):
+ if input_filename in self.image_suppression_set:
+ print "%s image diff comparison is suppressed" % input_filename
return True
return False
diff --git a/testing/tools/test_runner.py b/testing/tools/test_runner.py
index 81225b7de8..8f0670d33b 100644
--- a/testing/tools/test_runner.py
+++ b/testing/tools/test_runner.py
@@ -83,7 +83,7 @@ class TestRunner:
return False, results
else:
if (self.enforce_expected_images
- and not self.test_suppressor.IsPixelDiffSuppressed(input_filename)):
+ and not self.test_suppressor.IsImageDiffSuppressed(input_filename)):
print 'FAILURE: %s; Missing expected images' % input_filename
return False, results