Delete unused image test expectations
Gets rid of unused pixel test expectations. These expectations do not
match any current output, and so tests are just falling back to a less
specific expectation anyway.
Rather than being deleted entirely, some Mac-specific expectations have
been renamed to AGG Mac-specific expectations instead. This will help
ensure Skia configurations do not try to match against them.
Since all the changes are either deletions or renames, it shouldn't be
necessary to review the content of each individual image.
This change requires adding support for "_agg" expectations to the
presubmit. This change also tries to converge the presubmit in this
repository with testing/corpus's similar presubmit.
This change rolls in similar updates to the corpus tests.
Bug: pdfium:1987
Change-Id: Iee0c979fd1efa47067650c8d352780cbd7daac80
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/103711
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: K. Moon <kmoon@chromium.org>
diff --git a/DEPS b/DEPS
index 3c54098..7bb0542 100644
--- a/DEPS
+++ b/DEPS
@@ -140,7 +140,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling pdfium_tests
# and whatever else without interference from each other.
- 'pdfium_tests_revision': '776beedeaed3dd48f12d6decb393e3bdc1f86c9f',
+ 'pdfium_tests_revision': '96f53167dd82553b199038d455fa2644d6057726',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling resultdb
# and whatever else without interference from each other.
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index e44281b..236f896 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -424,23 +424,25 @@
return results
-def _CheckPNGFormat(input_api, output_api):
- """Checks that .png files have a format that will be considered valid by our
- test runners. If a file ends with .png, then it must be of the form
- NAME_expected(_skia)?(_(win|mac|linux))?.pdf.#.png
- The expected format used by _CheckPngNames() in testing/corpus/PRESUBMIT.py
- must be the same as this one.
+def _CheckPngNames(input_api, output_api):
+ """Checks that .png files have the right file name format, which must be in
+ the form:
+
+ NAME_expected(_(agg|skia))?(_(linux|mac|win))?.pdf.\d+.png
+
+ This must be the same format as the one in testing/corpus's PRESUBMIT.py.
"""
expected_pattern = input_api.re.compile(
- r'.+_expected(_skia)?(_(win|mac|linux))?\.pdf\.\d+.png')
+ r'.+_expected(_(agg|skia))?(_(linux|mac|win))?\.pdf\.\d+.png')
results = []
for f in input_api.AffectedFiles(include_deletes=False):
if not f.LocalPath().endswith('.png'):
continue
if expected_pattern.match(f.LocalPath()):
continue
- results.append(output_api.PresubmitError(
- 'PNG file %s does not have the correct format' % f.LocalPath()))
+ results.append(
+ output_api.PresubmitError(
+ 'PNG file %s does not have the correct format' % f.LocalPath()))
return results
@@ -526,7 +528,7 @@
results.extend(_CheckIncludeOrder(input_api, output_api))
results.extend(_CheckLibcxxRevision(input_api, output_api))
results.extend(_CheckTestDuplicates(input_api, output_api))
- results.extend(_CheckPNGFormat(input_api, output_api))
+ results.extend(_CheckPngNames(input_api, output_api))
results.extend(_CheckUselessForwardDeclarations(input_api, output_api))
author = input_api.change.author_email
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index 1c637e8..c5f9650 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -51,10 +51,12 @@
class CheckChangeOnUploadTest(unittest.TestCase):
- def testCheckPNGFormat(self):
+ def testCheckPngNames(self):
correct_paths = [
'test_expected.pdf.0.png',
'test_expected_win.pdf.1.png',
+ 'test_expected_agg.pdf.3.png',
+ 'test_expected_agg_linux.pdf.3.png',
'test_expected_skia.pdf.2.png',
'test_expected_skia_mac.pdf.4.png',
'notpng.cc', # Check will be skipped for non-PNG files
@@ -64,6 +66,7 @@
'test1_expected.0.png', # Missing '.pdf'
'test2_expected.pdf.png', # Missing page number
'test3_expected.pdf.x.png', # Wrong character for page number
+ 'test4_expected_linux_agg.pdf.0.png', # Wrong order of keywords
'test4_expected_mac_skia.pdf.0.png', # Wrong order of keywords
'test5_expected_useskia.pdf.0.png', # Wrong keyword
]
@@ -71,7 +74,7 @@
mock_output_api = MockOutputApi()
mock_input_api.files = map(MockFile, correct_paths + wrong_paths)
errors = list(
- map(str, PRESUBMIT._CheckPNGFormat(mock_input_api, mock_output_api)))
+ map(str, PRESUBMIT._CheckPngNames(mock_input_api, mock_output_api)))
self.assertEqual(len(wrong_paths), len(errors))
self.assertFalse('notpng.cc' in errors[0])
diff --git a/testing/resources/pixel/bug_1021762_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1021762_expected_skia.pdf.0.png
deleted file mode 100644
index 0ea45f4..0000000
--- a/testing/resources/pixel/bug_1021762_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1072440_expected_win.pdf.0.png b/testing/resources/pixel/bug_1072440_expected_win.pdf.0.png
deleted file mode 100644
index 445648a..0000000
--- a/testing/resources/pixel/bug_1072440_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_113910_expected_win.pdf.0.png b/testing/resources/pixel/bug_113910_expected_win.pdf.0.png
deleted file mode 100644
index 1cc1f6d..0000000
--- a/testing/resources/pixel/bug_113910_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1271578_expected_mac.pdf.0.png b/testing/resources/pixel/bug_1271578_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_1271578_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_1271578_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1271578_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1271578_expected_skia.pdf.0.png
deleted file mode 100644
index b37b9ec..0000000
--- a/testing/resources/pixel/bug_1271578_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_1_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_1308_1_expected_skia_mac.pdf.0.png
deleted file mode 100644
index 44c0446..0000000
--- a/testing/resources/pixel/bug_1308_1_expected_skia_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_1_expected_win.pdf.0.png b/testing/resources/pixel/bug_1308_1_expected_win.pdf.0.png
deleted file mode 100644
index 70d0f23..0000000
--- a/testing/resources/pixel/bug_1308_1_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_expected_mac.pdf.0.png b/testing/resources/pixel/bug_1308_expected_mac.pdf.0.png
deleted file mode 100644
index 570f992..0000000
--- a/testing/resources/pixel/bug_1308_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1308_expected_skia.pdf.0.png
deleted file mode 100644
index 1f02776..0000000
--- a/testing/resources/pixel/bug_1308_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png
deleted file mode 100644
index 17a0265..0000000
--- a/testing/resources/pixel/bug_1308_expected_skia_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1308_expected_win.pdf.0.png b/testing/resources/pixel/bug_1308_expected_win.pdf.0.png
deleted file mode 100644
index 0acd825..0000000
--- a/testing/resources/pixel/bug_1308_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1355_expected_mac.pdf.0.png b/testing/resources/pixel/bug_1355_expected_mac.pdf.0.png
deleted file mode 100644
index 4e32141..0000000
--- a/testing/resources/pixel/bug_1355_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1355_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_1355_expected_skia_mac.pdf.0.png
deleted file mode 100644
index 72c7de6..0000000
--- a/testing/resources/pixel/bug_1355_expected_skia_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_2_expected_mac.pdf.0.png b/testing/resources/pixel/bug_1388_2_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_1388_2_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_1388_2_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_2_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1388_2_expected_skia.pdf.0.png
deleted file mode 100644
index c5270f8..0000000
--- a/testing/resources/pixel/bug_1388_2_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_2_expected_win.pdf.0.png b/testing/resources/pixel/bug_1388_2_expected_win.pdf.0.png
deleted file mode 100644
index 58a14f4..0000000
--- a/testing/resources/pixel/bug_1388_2_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_1388_3_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_1388_3_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_1388_3_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_1388_3_expected_skia.pdf.0.png b/testing/resources/pixel/bug_1388_3_expected_skia.pdf.0.png
deleted file mode 100644
index b97bdeb..0000000
--- a/testing/resources/pixel/bug_1388_3_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1402_expected_mac.pdf.0.png b/testing/resources/pixel/bug_1402_expected_mac.pdf.0.png
deleted file mode 100644
index 9602820..0000000
--- a/testing/resources/pixel/bug_1402_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_1402_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_1402_expected_skia_mac.pdf.0.png
deleted file mode 100644
index 890456b..0000000
--- a/testing/resources/pixel/bug_1402_expected_skia_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_1_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_1_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_524043_1_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_524043_1_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_1_expected_skia.pdf.0.png b/testing/resources/pixel/bug_524043_1_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_524043_1_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_1_expected_win.pdf.0.png b/testing/resources/pixel/bug_524043_1_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_524043_1_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_2_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_2_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_524043_2_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_524043_2_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_2_expected_skia.pdf.0.png b/testing/resources/pixel/bug_524043_2_expected_skia.pdf.0.png
deleted file mode 100644
index 3908a47..0000000
--- a/testing/resources/pixel/bug_524043_2_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_2_expected_win.pdf.0.png b/testing/resources/pixel/bug_524043_2_expected_win.pdf.0.png
deleted file mode 100644
index 786d963..0000000
--- a/testing/resources/pixel/bug_524043_2_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_3_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_524043_3_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_skia.pdf.0.png b/testing/resources/pixel/bug_524043_3_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_524043_3_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_win.pdf.0.png b/testing/resources/pixel/bug_524043_3_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_524043_3_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_4_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png
copy to testing/resources/pixel/bug_524043_4_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_4_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_4_expected_mac.pdf.0.png
deleted file mode 100644
index e794355..0000000
--- a/testing/resources/pixel/bug_524043_4_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_4_expected_skia.pdf.0.png b/testing/resources/pixel/bug_524043_4_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_524043_4_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_4_expected_win.pdf.0.png b/testing/resources/pixel/bug_524043_4_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_524043_4_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_5_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png
copy to testing/resources/pixel/bug_524043_5_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_5_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_5_expected_mac.pdf.0.png
deleted file mode 100644
index e794355..0000000
--- a/testing/resources/pixel/bug_524043_5_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_5_expected_skia.pdf.0.png b/testing/resources/pixel/bug_524043_5_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_524043_5_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_5_expected_win.pdf.0.png b/testing/resources/pixel/bug_524043_5_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_524043_5_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_2_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_7_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/bug_524043_2_expected_mac.pdf.0.png
copy to testing/resources/pixel/bug_524043_7_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_7_expected_mac.pdf.0.png b/testing/resources/pixel/bug_524043_7_expected_mac.pdf.0.png
deleted file mode 100644
index e3bf21f..0000000
--- a/testing/resources/pixel/bug_524043_7_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_7_expected_skia.pdf.0.png b/testing/resources/pixel/bug_524043_7_expected_skia.pdf.0.png
deleted file mode 100644
index 3908a47..0000000
--- a/testing/resources/pixel/bug_524043_7_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_7_expected_win.pdf.0.png b/testing/resources/pixel/bug_524043_7_expected_win.pdf.0.png
deleted file mode 100644
index 786d963..0000000
--- a/testing/resources/pixel/bug_524043_7_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_528103_expected_mac.pdf.0.png b/testing/resources/pixel/bug_528103_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_528103_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_528103_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_528103_expected_skia.pdf.0.png b/testing/resources/pixel/bug_528103_expected_skia.pdf.0.png
deleted file mode 100644
index e7b9829..0000000
--- a/testing/resources/pixel/bug_528103_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_528103_expected_win.pdf.0.png b/testing/resources/pixel/bug_528103_expected_win.pdf.0.png
deleted file mode 100644
index e2dd561..0000000
--- a/testing/resources/pixel/bug_528103_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_543018_1_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png
copy to testing/resources/pixel/bug_543018_1_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_1_expected_mac.pdf.0.png b/testing/resources/pixel/bug_543018_1_expected_mac.pdf.0.png
deleted file mode 100644
index e794355..0000000
--- a/testing/resources/pixel/bug_543018_1_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_1_expected_skia.pdf.0.png b/testing/resources/pixel/bug_543018_1_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_543018_1_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_1_expected_win.pdf.0.png b/testing/resources/pixel/bug_543018_1_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_543018_1_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_543018_2_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png
copy to testing/resources/pixel/bug_543018_2_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_2_expected_mac.pdf.0.png b/testing/resources/pixel/bug_543018_2_expected_mac.pdf.0.png
deleted file mode 100644
index e794355..0000000
--- a/testing/resources/pixel/bug_543018_2_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_2_expected_skia.pdf.0.png b/testing/resources/pixel/bug_543018_2_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_543018_2_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_543018_2_expected_win.pdf.0.png b/testing/resources/pixel/bug_543018_2_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_543018_2_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png b/testing/resources/pixel/bug_551258_1_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/bug_524043_3_expected_mac.pdf.0.png
copy to testing/resources/pixel/bug_551258_1_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_551258_1_expected_mac.pdf.0.png b/testing/resources/pixel/bug_551258_1_expected_mac.pdf.0.png
deleted file mode 100644
index e794355..0000000
--- a/testing/resources/pixel/bug_551258_1_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_551258_1_expected_skia.pdf.0.png b/testing/resources/pixel/bug_551258_1_expected_skia.pdf.0.png
deleted file mode 100644
index eda2fff..0000000
--- a/testing/resources/pixel/bug_551258_1_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_551258_1_expected_win.pdf.0.png b/testing/resources/pixel/bug_551258_1_expected_win.pdf.0.png
deleted file mode 100644
index b2c134a..0000000
--- a/testing/resources/pixel/bug_551258_1_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_601362_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_601362_expected_skia_win.pdf.0.png
deleted file mode 100644
index 7cf473d..0000000
--- a/testing/resources/pixel/bug_601362_expected_skia_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_601362_expected_win.pdf.0.png b/testing/resources/pixel/bug_601362_expected_win.pdf.0.png
deleted file mode 100644
index 8efa181..0000000
--- a/testing/resources/pixel/bug_601362_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_665467_expected_skia_mac.pdf.0.png b/testing/resources/pixel/bug_665467_expected_skia_mac.pdf.0.png
deleted file mode 100644
index de31d02..0000000
--- a/testing/resources/pixel/bug_665467_expected_skia_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_665467_expected_skia_win.pdf.0.png b/testing/resources/pixel/bug_665467_expected_skia_win.pdf.0.png
deleted file mode 100644
index 3be12f0..0000000
--- a/testing/resources/pixel/bug_665467_expected_skia_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_665467_expected_win.pdf.0.png b/testing/resources/pixel/bug_665467_expected_win.pdf.0.png
deleted file mode 100644
index 0eefe91..0000000
--- a/testing/resources/pixel/bug_665467_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_733528_expected_win.pdf.0.png b/testing/resources/pixel/bug_733528_expected_win.pdf.0.png
deleted file mode 100644
index a44b932..0000000
--- a/testing/resources/pixel/bug_733528_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_2_expected_win.pdf.0.png b/testing/resources/pixel/bug_736695_2_expected_win.pdf.0.png
deleted file mode 100644
index ffa94f0..0000000
--- a/testing/resources/pixel/bug_736695_2_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_736695_3_expected_win.pdf.0.png b/testing/resources/pixel/bug_736695_3_expected_win.pdf.0.png
deleted file mode 100644
index d27a9b4..0000000
--- a/testing/resources/pixel/bug_736695_3_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_820345_expected_mac.pdf.0.png b/testing/resources/pixel/bug_820345_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_820345_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_820345_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_820345_expected_skia.pdf.0.png b/testing/resources/pixel/bug_820345_expected_skia.pdf.0.png
deleted file mode 100644
index d2ce882..0000000
--- a/testing/resources/pixel/bug_820345_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_820345_expected_win.pdf.0.png b/testing/resources/pixel/bug_820345_expected_win.pdf.0.png
deleted file mode 100644
index c3b8b43..0000000
--- a/testing/resources/pixel/bug_820345_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_845697_expected_win.pdf.0.png b/testing/resources/pixel/bug_845697_expected_win.pdf.0.png
deleted file mode 100644
index 598275b..0000000
--- a/testing/resources/pixel/bug_845697_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_925736_expected_mac.pdf.0.png b/testing/resources/pixel/bug_925736_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_925736_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_925736_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_925736_expected_skia.pdf.0.png b/testing/resources/pixel/bug_925736_expected_skia.pdf.0.png
deleted file mode 100644
index 154cfee..0000000
--- a/testing/resources/pixel/bug_925736_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/bug_984811_expected_mac.pdf.0.png b/testing/resources/pixel/bug_984811_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/bug_984811_expected_mac.pdf.0.png
rename to testing/resources/pixel/bug_984811_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_984811_expected_skia.pdf.0.png b/testing/resources/pixel/bug_984811_expected_skia.pdf.0.png
deleted file mode 100644
index 9c713b5..0000000
--- a/testing/resources/pixel/bug_984811_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/font_size_expected_mac.pdf.0.png b/testing/resources/pixel/font_size_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/font_size_expected_mac.pdf.0.png
rename to testing/resources/pixel/font_size_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/font_size_expected_skia.pdf.0.png b/testing/resources/pixel/font_size_expected_skia.pdf.0.png
deleted file mode 100644
index 04e8b5a..0000000
--- a/testing/resources/pixel/font_size_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/font_size_expected_win.pdf.0.png b/testing/resources/pixel/font_size_expected_win.pdf.0.png
deleted file mode 100644
index a0d56aa..0000000
--- a/testing/resources/pixel/font_size_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers1_expected_mac.pdf.0.png b/testing/resources/pixel/generation_numbers1_expected_agg_mac.pdf.0.png
similarity index 100%
rename from testing/resources/pixel/generation_numbers1_expected_mac.pdf.0.png
rename to testing/resources/pixel/generation_numbers1_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers1_expected_skia.pdf.0.png b/testing/resources/pixel/generation_numbers1_expected_skia.pdf.0.png
deleted file mode 100644
index 4fecd67..0000000
--- a/testing/resources/pixel/generation_numbers1_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers1_expected_win.pdf.0.png b/testing/resources/pixel/generation_numbers1_expected_win.pdf.0.png
deleted file mode 100644
index 7f1047c..0000000
--- a/testing/resources/pixel/generation_numbers1_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers1_expected_mac.pdf.0.png b/testing/resources/pixel/generation_numbers2_expected_agg_mac.pdf.0.png
similarity index 100%
copy from testing/resources/pixel/generation_numbers1_expected_mac.pdf.0.png
copy to testing/resources/pixel/generation_numbers2_expected_agg_mac.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers2_expected_mac.pdf.0.png b/testing/resources/pixel/generation_numbers2_expected_mac.pdf.0.png
deleted file mode 100644
index c946aa7..0000000
--- a/testing/resources/pixel/generation_numbers2_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers2_expected_skia.pdf.0.png b/testing/resources/pixel/generation_numbers2_expected_skia.pdf.0.png
deleted file mode 100644
index 4fecd67..0000000
--- a/testing/resources/pixel/generation_numbers2_expected_skia.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/generation_numbers2_expected_win.pdf.0.png b/testing/resources/pixel/generation_numbers2_expected_win.pdf.0.png
deleted file mode 100644
index 7f1047c..0000000
--- a/testing/resources/pixel/generation_numbers2_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/password_expected_win.pdf.0.png b/testing/resources/pixel/password_expected_win.pdf.0.png
deleted file mode 100644
index d6d826c..0000000
--- a/testing/resources/pixel/password_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets1_expected_win.pdf.0.png b/testing/resources/pixel/scrollable_widgets1_expected_win.pdf.0.png
deleted file mode 100644
index 25b95ec..0000000
--- a/testing/resources/pixel/scrollable_widgets1_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/scrollable_widgets2_expected_win.pdf.0.png b/testing/resources/pixel/scrollable_widgets2_expected_win.pdf.0.png
deleted file mode 100644
index 292c873..0000000
--- a/testing/resources/pixel/scrollable_widgets2_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/use_symbolneu/bug_1449_expected_mac.pdf.0.png b/testing/resources/pixel/use_symbolneu/bug_1449_expected_mac.pdf.0.png
deleted file mode 100644
index a83159b..0000000
--- a/testing/resources/pixel/use_symbolneu/bug_1449_expected_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/use_symbolneu/bug_1449_expected_skia_mac.pdf.0.png b/testing/resources/pixel/use_symbolneu/bug_1449_expected_skia_mac.pdf.0.png
deleted file mode 100644
index 534edc2..0000000
--- a/testing/resources/pixel/use_symbolneu/bug_1449_expected_skia_mac.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/barcode_test_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/barcode_test_expected_win.pdf.0.png
deleted file mode 100644
index 23b80a7..0000000
--- a/testing/resources/pixel/xfa_specific/barcode_test_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_win.pdf.0.png
deleted file mode 100644
index 2cf7145..0000000
--- a/testing/resources/pixel/xfa_specific/dynamic_password_field_background_fill_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png
deleted file mode 100644
index eae383c..0000000
--- a/testing/resources/pixel/xfa_specific/dynamic_table_color_and_width_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png
deleted file mode 100644
index 71edafd..0000000
--- a/testing/resources/pixel/xfa_specific/static_list_box_caption_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
diff --git a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png b/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png
deleted file mode 100644
index ea939ac..0000000
--- a/testing/resources/pixel/xfa_specific/static_password_field_rotate_expected_win.pdf.0.png
+++ /dev/null
Binary files differ
