Convert pdfium expected test results to PNG format.

testing/tools/run_pixel_tests.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 optparse
 import os
 import re
 import subprocess
 import sys
 
 # Nomenclature:
 #   x_root - "x"
 #   x_filename - "x.ext"
 #   x_path - "path/to/a/b/c/x.ext"
 #   c_dir - "path/to/a/b/c"
 
 def generate_and_test(input_filename, source_dir, working_dir,
-                      fixup_path, pdfium_test_path):
+                      fixup_path, pdfium_test_path, pdfium_diff_path):
   input_root, _ = os.path.splitext(input_filename)
   input_path = os.path.join(source_dir, input_root + '.in')
   pdf_path = os.path.join(working_dir, input_root + '.pdf')
-  actual_path_template = os.path.join(working_dir, input_root + '.pdf.%d.ppm')
+  actual_path_template = os.path.join(working_dir, input_root + '.pdf.%d.png')
   expected_path_template = os.path.join(source_dir,
-                                        input_root + '_expected.pdf.%d.ppm')
+                                        input_root + '_expected.pdf.%d.png')
   try:
     subprocess.check_call(
         [fixup_path, '--output-dir=' + working_dir, input_path])
-    subprocess.check_call([pdfium_test_path, '--ppm', pdf_path])
+    subprocess.check_call([pdfium_test_path, '--png', pdf_path])
     i = 0;
     while True:
       expected_path = expected_path_template % i;
       actual_path = actual_path_template % i;
       if not os.path.exists(expected_path):
+        if i == 0:
+          print "WARNING: no expected results files found for " + input_filename
         break
-      subprocess.check_call(['diff', expected_path, actual_path])
+      print "Checking " + actual_path
+      subprocess.check_call([pdfium_diff_path, expected_path, actual_path])
       i += 1
   except subprocess.CalledProcessError as e:
     print "FAILURE: " + input_filename + "; " + str(e)
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('--build-dir', default=os.path.join('out', 'Debug'),
                     help='relative path from the base source directory')
   options, args = parser.parse_args()
 
@@ skipping 21 matching lines @@
   base_dir = pdfium_dir
   one_up_dir = os.path.dirname(base_dir)
   two_up_dir = os.path.dirname(one_up_dir)
   if (os.path.basename(two_up_dir) == 'src' and
       os.path.basename(one_up_dir) == 'third_party'):
     base_dir = two_up_dir
   build_dir = os.path.join(base_dir, options.build_dir)
 
   # Compiled binaries are found under the build path.
   pdfium_test_path = os.path.join(build_dir, 'pdfium_test')
+  pdfium_diff_path = os.path.join(build_dir, 'pdfium_diff')
   if sys.platform.startswith('win'):
     pdfium_test_path = pdfium_test_path + '.exe'
+    pdfium_diff_path = pdfium_diff_path + '.exe'
   # TODO(tsepez): Mac may require special handling here.
 
   # Place generated files under the build directory, not source directory.
   gen_dir = os.path.join(build_dir, 'gen', 'pdfium')
   working_dir = os.path.join(gen_dir, 'testing', 'pixel')
   if not os.path.exists(working_dir):
     os.makedirs(working_dir)
 
   input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]in$')
   for input_filename in os.listdir(source_dir):
     if input_file_re.match(input_filename):
       input_path = os.path.join(source_dir, input_filename)
       if os.path.isfile(input_path):
         generate_and_test(input_filename, source_dir, working_dir,
-                          fixup_path, pdfium_test_path)
+                          fixup_path, pdfium_test_path, pdfium_diff_path)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())