diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | testing/SUPPRESSIONS | 47 | ||||
| -rw-r--r-- | testing/SUPPRESSIONS_linux | 3 | ||||
| -rw-r--r-- | testing/SUPPRESSIONS_mac | 185 | ||||
| -rw-r--r-- | testing/SUPPRESSIONS_win | 27 | ||||
| -rwxr-xr-x | testing/tools/common.py | 70 | ||||
| -rwxr-xr-x | testing/tools/pngdiffer.py | 48 | ||||
| -rwxr-xr-x | testing/tools/run_corpus_tests.py | 87 | ||||
| -rwxr-xr-x | testing/tools/run_javascript_tests.py | 68 | ||||
| -rwxr-xr-x | testing/tools/run_pixel_tests.py | 91 | ||||
| -rwxr-xr-x | testing/tools/suppressor.py | 34 | ||||
| -rwxr-xr-x | testing/tools/text_diff.py | 32 |
12 files changed, 528 insertions, 166 deletions
@@ -3,7 +3,7 @@ deps = { "https://chromium.googlesource.com/external/gyp", "testing/corpus": - "https://pdfium.googlesource.com/pdfium_tests", + "https://pdfium.googlesource.com/pdfium_tests@e733fe1d98fad50c9b5f4023f08db429143b1291", "testing/gmock": "https://chromium.googlesource.com/external/googlemock.git@29763965ab52f24565299976b936d1265cb6a271", diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS new file mode 100644 index 0000000000..696e3f3e6d --- /dev/null +++ b/testing/SUPPRESSIONS @@ -0,0 +1,47 @@ +# List of tests to be skipped, on all platforms, one per line. +# Try to keep the file alphabetized. +1_10_watermark.pdf +1_1_textbox.pdf +1_2_typewriter.pdf +1_3_callout.pdf +2_6_textbox.pdf +3_4_textbox.pdf +5.2.pdf +action.pdf +all_trigger_alert.pdf +all_trigger_browsefordoc.pdf +all_trigger_mailmsg.pdf +all_trigger_newdoc.pdf +all_trigger_print.pdf +bookmark.pdf +calcorderindex_test.pdf +calculate_order.pdf +ch_1.pdf +check_box.pdf +combo_box.pdf +fillform.pdf +form_action_trigger.pdf +form_button_sign_url.pdf +form_combo_sign_url.pdf +form_combobox0.pdf +form_combobox_actioin_goto.pdf +form_combobox_date1.pdf +form_combobox_importform.pdf +form_combobox_resetform.pdf +form_list.pdf +form_list1.pdf +form_text_sign_url.pdf +format_custom_keystroke.pdf +formfeild.pdf +javascriptaction.pdf +js_calculate.pdf +list_box.pdf +number.pdf +push_button.pdf +radio_button.pdf +run_custom_validate_script.pdf +signature.pdf +signature_4.pdf +test_app_beep.pdf +test_control.pdf +text_field.pdf diff --git a/testing/SUPPRESSIONS_linux b/testing/SUPPRESSIONS_linux new file mode 100644 index 0000000000..86e3a0602b --- /dev/null +++ b/testing/SUPPRESSIONS_linux @@ -0,0 +1,3 @@ +# List of tests to be skipped on linux platforms, one per line. +# Try to keep the file alphabetized. +format_custom_format.pdf diff --git a/testing/SUPPRESSIONS_mac b/testing/SUPPRESSIONS_mac new file mode 100644 index 0000000000..56e8631c2a --- /dev/null +++ b/testing/SUPPRESSIONS_mac @@ -0,0 +1,185 @@ +# List of tests to be skipped on mac platforms, one per line. +# Try to keep the file alphabetized. + +# Pixel tests +font_size.in + +# Corpus tests +050_extra_m.pdf +12.pdf +1_matrix.pdf +1m_diff_lsjdf.pdf +1m_same_xxxx.pdf +2_11_stamp3.pdf +2_color_calrgb.pdf +2_color_indexed.pdf +2_uncolor_tiling.pdf +3_interpolate_image.pdf +3bigpreview.pdf +4_35.pdf +4_39.pdf +5.1.pdf +5.5_simple_font.pdf +8.2_name_dest_f_dest.pdf +8.2_outline.pdf +8.3_presentation.pdf +action_execute_a_menu_item.pdf +action_hide_show_form.pdf +action_on_focus.pdf +action_open_a_file.pdf +action_pdf_save_close.pdf +action_reset.pdf +action_run_javascript.pdf +action_submit_a_form.pdf +all_trigger_run_js_lunchurl.pdf +all_trigger_run_js_maildoc.pdf +app_launchurl.pdf +appstoredescription3.1_en_updated.pdf +bookmarkgetcolor.pdf +bug_0_length_line.pdf +bug_0_width_line.pdf +bug_white_space.pdf +calculate_average.pdf +calculate_sum_a_b_c.pdf +calculate_validate.pdf +color.pdf +colorspace.pdf +colorspace_test1.pdf +combo_box_format.pdf +date.pdf +edit_transform.pdf +en_contact.pdf +en_diy.pdf +en_foxit.pdf +en_fqa2.pdf +en_introduce.pdf +en_tem.pdf +en_uicase_.pdf +event.change.pdf +event.changeex.pdf +event.keydown.pdf +event.keydown_1_.pdf +event.type_name.pdf +event.value.pdf +event_change.pdf +example_001.pdf +example_002.pdf +example_003.pdf +example_004.pdf +example_005.pdf +example_006.pdf +example_007.pdf +example_008.pdf +example_009.pdf +example_010.pdf +example_011.pdf +example_012.pdf +example_013.pdf +example_014.pdf +example_015.pdf +example_016.pdf +example_017.pdf +example_018.pdf +example_019.pdf +example_020.pdf +example_021.pdf +example_022.pdf +example_023.pdf +example_024.pdf +example_025.pdf +example_026.pdf +example_027.pdf +example_028.pdf +example_029.pdf +example_030.pdf +example_031.pdf +example_032.pdf +example_033.pdf +example_034.pdf +example_035.pdf +example_036.pdf +example_037.pdf +example_038.pdf +example_039.pdf +example_040.pdf +example_041.pdf +example_042.pdf +example_043.pdf +example_044.pdf +example_045.pdf +example_046.pdf +example_047.pdf +example_048.pdf +example_049.pdf +example_050.pdf +example_051.pdf +example_052.pdf +example_053.pdf +example_054.pdf +example_055.pdf +example_056.pdf +example_057.pdf +example_058.pdf +example_059.pdf +example_060.pdf +example_061.pdf +example_062.pdf +example_063.pdf +example_064.pdf +example_065.pdf +font_1_embedded_font_en_feature.pdf +font_2_embedded_font_en_size14.pdf +form_combobox_date.pdf +form_combobox_date2.pdf +form_combobox_num.pdf +form_combobox_per.pdf +form_combobox_plus.pdf +form_combobox_product.pdf +form_combobox_time.pdf +form_same.pdf +format_combo_box.pdf +format_custom_format.pdf +format_number.pdf +format_percentage.pdf +format_text_color.pdf +getarray.pdf +group_xobject.pdf +jetman_std.pdf +negative.pdf +new_certify1.pdf +new_signature1.pdf +new_signature2.pdf +new_stamp4.pdf +new_stamp5.pdf +new_textmarkup1.pdf +new_textmarkup2.pdf +new_textmarkup4.pdf +new_textmarkup5.pdf +new_textmarkup6.pdf +new_textmarkup7.pdf +new_textmarkup8.pdf +octest.pdf +open_a_weblink.pdf +path_10_jd.pdf +path_5_pattern.pdf +path_6_graphics4.5.5.pdf +path_7.pdf +path_9.pdf +percentage.pdf +quick_start_guide.pdf +show_1.pdf +simplified_field_notation.pdf +special.pdf +submit_form.pdf +test_m.pdf +text_field_font_input_decimal_point.pdf +text_field_multiline_line_spacing.pdf +thread_action.pdf +time.pdf +transformation.pdf +transparent.pdf +whats_new_in_v3.0.pdf +widget_javascript.pdf +zh_file1.pdf +zh_function_list.pdf +zh_shared_document.pdf diff --git a/testing/SUPPRESSIONS_win b/testing/SUPPRESSIONS_win new file mode 100644 index 0000000000..00687fab54 --- /dev/null +++ b/testing/SUPPRESSIONS_win @@ -0,0 +1,27 @@ +# List of tests to be skipped on windows platforms, one per line. +# Try to keep the file alphabetized. +050_extra_m.pdf +12.pdf +2_uncolor_tiling.pdf +3bigpreview.pdf +5.5_simple_font.pdf +bookmarkgetcolor.pdf +en_contact.pdf +en_diy.pdf +example_010.pdf +example_014.pdf +example_015.pdf +example_033.pdf +example_036.pdf +example_038.pdf +example_041.pdf +example_044.pdf +example_045.pdf +example_046.pdf +example_053.pdf +example_055.pdf +example_065.pdf +font_1_embedded_font_en_feature.pdf +font_2_embedded_font_en_size14.pdf +path_5_pattern.pdf +test_m.pdf diff --git a/testing/tools/common.py b/testing/tools/common.py new file mode 100755 index 0000000000..14745a8a3e --- /dev/null +++ b/testing/tools/common.py @@ -0,0 +1,70 @@ +#!/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 sys + +def os_name(): + if sys.platform.startswith('linux'): + return 'linux' + if sys.platform.startswith('win'): + return 'win' + if sys.platform.startswith('darwin'): + return 'mac' + raise Exception('Confused, can not determine OS, aborting.') + + +class DirectoryFinder: + '''A class for finding directories and paths under either a standalone + checkout or a chromium checkout of PDFium.''' + + def __init__(self, build_location): + # |build_location| is typically "out/Debug" or "out/Release". + # Expect |my_dir| to be .../pdfium/testing/tools. + self.my_dir = os.path.dirname(os.path.realpath(__file__)) + self.testing_dir = os.path.dirname(self.my_dir) + if (os.path.basename(self.my_dir) != 'tools' or + os.path.basename(self.testing_dir) != 'testing'): + raise Exception('Confused, can not find pdfium root directory, aborting.') + self.pdfium_dir = os.path.dirname(self.testing_dir) + # Find path to build directory. This depends on whether this is a + # standalone build vs. a build as part of a chromium checkout. For + # standalone, we expect a path like .../pdfium/out/Debug, but for + # chromium, we expect a path like .../src/out/Debug two levels + # higher (to skip over the third_party/pdfium path component under + # which chromium sticks pdfium). + self.base_dir = self.pdfium_dir + one_up_dir = os.path.dirname(self.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'): + self.base_dir = two_up_dir + self.build_dir = os.path.join(self.base_dir, build_location) + self.os_name = os_name() + + def ExecutablePath(self, name): + '''Finds compiled binaries under the build path.''' + result = os.path.join(self.build_dir, name) + if self.os_name == 'win': + result = result + '.exe' + return result + + def ScriptPath(self, name): + '''Finds other scripts in the same directory as this one.''' + return os.path.join(self.my_dir, name) + + def WorkingDir(self, other_components=''): + '''Places generated files under the build directory, not source dir.''' + result = os.path.join(self.build_dir, 'gen', 'pdfium') + if other_components: + result = os.path.join(result, other_components) + return result + + def TestingDir(self, other_components=''): + '''Finds test files somewhere under the testing directory.''' + result = self.testing_dir + if other_components: + result = os.path.join(result, other_components) + return result diff --git a/testing/tools/pngdiffer.py b/testing/tools/pngdiffer.py new file mode 100755 index 0000000000..7a7e8ddbc6 --- /dev/null +++ b/testing/tools/pngdiffer.py @@ -0,0 +1,48 @@ +#!/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 subprocess +import sys + +class PNGDiffer(): + ACTUAL_TEMPLATE = '.pdf.%d.png' + EXPECTED_TEMPLATE = '_expected' + ACTUAL_TEMPLATE + PLATFORM_EXPECTED_TEMPLATE = '_expected_%s' + ACTUAL_TEMPLATE + + def __init__(self, finder): + self.pdfium_diff_path = finder.ExecutablePath('pdfium_diff') + self.os_name = finder.os_name + + def HasDifferences(self, input_filename, source_dir, working_dir): + input_root, _ = os.path.splitext(input_filename) + actual_path_template = os.path.join( + working_dir, input_root + self.ACTUAL_TEMPLATE) + expected_path_template = os.path.join( + source_dir, input_root + self.EXPECTED_TEMPLATE) + platform_expected_path_template = os.path.join( + source_dir, input_root + self.PLATFORM_EXPECTED_TEMPLATE) + i = 0 + try: + while True: + actual_path = actual_path_template % i + expected_path = expected_path_template % i + platform_expected_path = ( + platform_expected_path_template % (self.os_name, i)) + if os.path.exists(platform_expected_path): + expected_path = platform_expected_path + elif not os.path.exists(expected_path): + if i == 0: + print "WARNING: no expected results files for " + input_filename + break + print "Checking " + actual_path + sys.stdout.flush() + subprocess.check_call( + [self.pdfium_diff_path, expected_path, actual_path]) + i += 1 + except subprocess.CalledProcessError as e: + print "FAILURE: " + input_filename + "; " + str(e) + return True + return False diff --git a/testing/tools/run_corpus_tests.py b/testing/tools/run_corpus_tests.py index 2f6de07212..13376f7878 100755 --- a/testing/tools/run_corpus_tests.py +++ b/testing/tools/run_corpus_tests.py @@ -6,9 +6,14 @@ import optparse import os import re +import shutil import subprocess import sys +import common +import pngdiffer +import suppressor + # Nomenclature: # x_root - "x" # x_filename - "x.ext" @@ -16,30 +21,18 @@ import sys # c_dir - "path/to/a/b/c" def test_one_file(input_filename, source_dir, working_dir, - pdfium_test_path, pdfium_diff_path): - input_root, _ = os.path.splitext(input_filename) + pdfium_test_path, image_differ): input_path = os.path.join(source_dir, input_filename) pdf_path = os.path.join(working_dir, input_filename) - 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.png') try: - subprocess.check_call(['cp', input_path, pdf_path]) + shutil.copyfile(input_path, pdf_path) + sys.stdout.flush() 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 - 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) return False + if image_differ.HasDifferences(input_filename, source_dir, working_dir): + return False return True def main(): @@ -47,57 +40,37 @@ def main(): parser.add_option('--build-dir', default=os.path.join('out', 'Debug'), help='relative path from the base source directory') options, args = parser.parse_args() - - # Expect |my_dir| to be .../pdfium/testing/tools. - my_dir = os.path.dirname(os.path.realpath(__file__)) - testing_dir = os.path.dirname(my_dir) - pdfium_dir = os.path.dirname(testing_dir) - if (os.path.basename(my_dir) != 'tools' or - os.path.basename(testing_dir) != 'testing'): - print 'Confused, can not find pdfium root directory, aborting.' - return 1 - - # Find path to build directory. This depends on whether this is a - # standalone build vs. a build as part of a chromium checkout. For - # standalone, we expect a path like .../pdfium/out/Debug, but for - # chromium, we expect a path like .../src/out/Debug two levels - # higher (to skip over the third_party/pdfium path component under - # which chromium sticks pdfium). - 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. - working_dir = os.path.join(build_dir, 'gen', 'pdfium', 'testing', 'corpus') + finder = common.DirectoryFinder(options.build_dir) + pdfium_test_path = finder.ExecutablePath('pdfium_test') + working_dir = finder.WorkingDir(os.path.join('testing', 'corpus')) if not os.path.exists(working_dir): os.makedirs(working_dir) + test_suppressor = suppressor.Suppressor(finder) + image_differ = pngdiffer.PNGDiffer(finder) + # test files are under .../pdfium/testing/corpus. - os_exit_code = 0 - walk_from_dir = os.path.join(testing_dir, 'corpus'); + failures = [] + walk_from_dir = finder.TestingDir('corpus'); input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]pdf$') for source_dir, _, filename_list in os.walk(walk_from_dir): for input_filename in filename_list: if input_file_re.match(input_filename): input_path = os.path.join(source_dir, input_filename) if os.path.isfile(input_path): - if not test_one_file(input_filename, source_dir, working_dir, - pdfium_test_path, pdfium_diff_path): - os_exit_code = 1 + if test_suppressor.IsSuppressed(input_filename): + continue + if not test_one_file(input_filename, source_dir, working_dir, + pdfium_test_path, image_differ): + failures.append(input_path) + + if failures: + print '\n\nSummary of Failures:' + for failure in failures: + print failure + return 1 - return os_exit_code + return 0 if __name__ == '__main__': diff --git a/testing/tools/run_javascript_tests.py b/testing/tools/run_javascript_tests.py index ddc82665d5..9b3d69e8f3 100755 --- a/testing/tools/run_javascript_tests.py +++ b/testing/tools/run_javascript_tests.py @@ -9,6 +9,8 @@ import re import subprocess import sys +import common + # Nomenclature: # x_root - "x" # x_filename - "x.ext" @@ -16,18 +18,20 @@ import sys # 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, text_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') txt_path = os.path.join(working_dir, input_root + '.txt') expected_path = os.path.join(source_dir, input_root + '_expected.txt') try: + sys.stdout.flush() subprocess.check_call( - [fixup_path, '--output-dir=' + working_dir, input_path]) + [sys.executable, fixup_path, '--output-dir=' + working_dir, input_path]) with open(txt_path, 'w') as outfile: subprocess.check_call([pdfium_test_path, pdf_path], stdout=outfile) - subprocess.check_call(['diff', expected_path, txt_path]) + subprocess.check_call( + [sys.executable, text_diff_path, expected_path, txt_path]) except subprocess.CalledProcessError as e: print "FAILURE: " + input_filename + "; " + str(e) return False @@ -38,59 +42,31 @@ def main(): parser.add_option('--build-dir', default=os.path.join('out', 'Debug'), help='relative path from the base source directory') options, args = parser.parse_args() - - # Expect |my_dir| to be .../pdfium/testing/tools. - my_dir = os.path.dirname(os.path.realpath(__file__)) - testing_dir = os.path.dirname(my_dir) - pdfium_dir = os.path.dirname(testing_dir) - if (os.path.basename(my_dir) != 'tools' or - os.path.basename(testing_dir) != 'testing'): - print 'Confused, can not find pdfium root directory, aborting.' - return 1 - - # Other scripts are found in the same directory as this one. - fixup_path = os.path.join(my_dir, 'fixup_pdf_template.py') - - # test files are in .../pdfium/testing/resources/javascript. - source_dir = os.path.join(testing_dir, 'resources', 'javascript') - - # Find path to build directory. This depends on whether this is a - # standalone build vs. a build as part of a chromium checkout. For - # standalone, we expect a path like .../pdfium/out/Debug, but for - # chromium, we expect a path like .../src/out/Debug two levels - # higher (to skip over the third_party/pdfium path component under - # which chromium sticks pdfium). - 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') - if sys.platform.startswith('win'): - pdfium_test_path = pdfium_test_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', 'javascript') + finder = common.DirectoryFinder(options.build_dir) + fixup_path = finder.ScriptPath('fixup_pdf_template.py') + text_diff_path = finder.ScriptPath('text_diff.py') + source_dir = finder.TestingDir(os.path.join('resources', 'javascript')) + pdfium_test_path = finder.ExecutablePath('pdfium_test') + working_dir = finder.WorkingDir(os.path.join('testing', 'javascript')) if not os.path.exists(working_dir): os.makedirs(working_dir) - os_exit_code = 0 + failures = [] 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): if not generate_and_test(input_filename, source_dir, working_dir, - fixup_path, pdfium_test_path): - os_exit_code = 1 + fixup_path, pdfium_test_path, text_diff_path): + failures.append(input_path) - return os_exit_code + if failures: + print '\n\nSummary of Failures:' + for failure in failures: + print failure + return 1 + return 0 if __name__ == '__main__': diff --git a/testing/tools/run_pixel_tests.py b/testing/tools/run_pixel_tests.py index 9bd321b560..1fec0ddcb1 100755 --- a/testing/tools/run_pixel_tests.py +++ b/testing/tools/run_pixel_tests.py @@ -9,6 +9,10 @@ import re import subprocess import sys +import common +import pngdiffer +import suppressor + # Nomenclature: # x_root - "x" # x_filename - "x.ext" @@ -16,31 +20,21 @@ import sys # c_dir - "path/to/a/b/c" def generate_and_test(input_filename, source_dir, working_dir, - fixup_path, pdfium_test_path, pdfium_diff_path): + fixup_path, pdfium_test_path, image_differ): 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.png') - expected_path_template = os.path.join(source_dir, - input_root + '_expected.pdf.%d.png') try: + sys.stdout.flush() subprocess.check_call( - [fixup_path, '--output-dir=' + working_dir, input_path]) + [sys.executable, fixup_path, '--output-dir=' + working_dir, input_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 - 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) return False + if image_differ.HasDifferences(input_filename, source_dir, working_dir): + print "FAILURE: " + input_filename + return False return True def main(): @@ -48,62 +42,35 @@ def main(): parser.add_option('--build-dir', default=os.path.join('out', 'Debug'), help='relative path from the base source directory') options, args = parser.parse_args() - - # Expect |my_dir| to be .../pdfium/testing/tools. - my_dir = os.path.dirname(os.path.realpath(__file__)) - testing_dir = os.path.dirname(my_dir) - pdfium_dir = os.path.dirname(testing_dir) - if (os.path.basename(my_dir) != 'tools' or - os.path.basename(testing_dir) != 'testing'): - print 'Confused, can not find pdfium root directory, aborting.' - return 1 - - # Other scripts are found in the same directory as this one. - fixup_path = os.path.join(my_dir, 'fixup_pdf_template.py') - - # test files are in .../pdfium/testing/resources/pixel. - source_dir = os.path.join(testing_dir, 'resources', 'pixel') - - # Find path to build directory. This depends on whether this is a - # standalone build vs. a build as part of a chromium checkout. For - # standalone, we expect a path like .../pdfium/out/Debug, but for - # chromium, we expect a path like .../src/out/Debug two levels - # higher (to skip over the third_party/pdfium path component under - # which chromium sticks pdfium). - 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') + finder = common.DirectoryFinder(options.build_dir) + fixup_path = finder.ScriptPath('fixup_pdf_template.py') + source_dir = finder.TestingDir(os.path.join('resources', 'pixel')) + pdfium_test_path = finder.ExecutablePath('pdfium_test') + working_dir = finder.WorkingDir(os.path.join('testing', 'pixel')) if not os.path.exists(working_dir): os.makedirs(working_dir) - os_exit_code = 0 + test_suppressor = suppressor.Suppressor(finder) + image_differ = pngdiffer.PNGDiffer(finder) + + failures = [] 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): + if test_suppressor.IsSuppressed(input_filename): + continue if not generate_and_test(input_filename, source_dir, working_dir, - fixup_path, pdfium_test_path, pdfium_diff_path): - os_exit_code = 1 - - return os_exit_code + fixup_path, pdfium_test_path, image_differ): + failures.append(input_path) + if failures: + print '\n\nSummary of Failures:' + for failure in failures: + print failure + return 1 + return 0 if __name__ == '__main__': sys.exit(main()) diff --git a/testing/tools/suppressor.py b/testing/tools/suppressor.py new file mode 100755 index 0000000000..fff9bc8381 --- /dev/null +++ b/testing/tools/suppressor.py @@ -0,0 +1,34 @@ +#!/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: + SUPPRESSIONS_FILENAME = 'SUPPRESSIONS' + PLATFORM_SUPPRESSIONS_FILENAME = 'SUPPRESSIONS_%s' % common.os_name() + + def __init__(self, finder): + testing_dir = finder.TestingDir() + self.suppression_list = self._ExtractSuppressions( + os.path.join(testing_dir, self.SUPPRESSIONS_FILENAME)) + self.platform_suppression_list = self._ExtractSuppressions( + os.path.join(testing_dir, self.PLATFORM_SUPPRESSIONS_FILENAME)) + + def _ExtractSuppressions(self, suppressions_filename): + with open(suppressions_filename) as f: + return [y for y in [x.split('#')[0].strip() for x in f.readlines()] if y] + + def IsSuppressed(self, input_filename): + if input_filename in self.suppression_list: + print ("Not running %s, found in %s file" % + (input_filename, self.SUPPRESSIONS_FILENAME)) + return True + if input_filename in self.platform_suppression_list: + print ("Not running %s, found in %s file" % + (input_filename, self.PLATFORM_SUPPRESSIONS_FILENAME)) + return True + return False diff --git a/testing/tools/text_diff.py b/testing/tools/text_diff.py new file mode 100755 index 0000000000..3a5bd7bf6a --- /dev/null +++ b/testing/tools/text_diff.py @@ -0,0 +1,32 @@ +#!/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 difflib +import sys + +def main(argv): + if len(argv) != 3: + print '%s: invalid arguments' % argv[0] + return 2 + filename1 = argv[1] + filename2 = argv[2] + try: + with open(filename1, "r") as f1: + str1 = f1.readlines(); + with open(filename2, "r") as f2: + str2 = f2.readlines(); + diffs = difflib.unified_diff( + str1, str2, fromfile=filename1, tofile=filename2) + except Exception as e: + print "something went astray: %s" % e + return 1 + status_code = 0 + for diff in diffs: + sys.stdout.write(diff) + status_code = 1 + return status_code + +if __name__ == '__main__': + sys.exit(main(sys.argv)) |