diff options
| -rwxr-xr-x | testing/tools/run_corpus_tests.py | 25 | ||||
| -rwxr-xr-x | testing/tools/run_javascript_tests.py | 10 | ||||
| -rwxr-xr-x | testing/tools/run_pixel_tests.py | 9 |
3 files changed, 35 insertions, 9 deletions
diff --git a/testing/tools/run_corpus_tests.py b/testing/tools/run_corpus_tests.py index b6cbff7537..29f23b504a 100755 --- a/testing/tools/run_corpus_tests.py +++ b/testing/tools/run_corpus_tests.py @@ -104,14 +104,25 @@ def main(): walk_from_dir = finder.TestingDir('corpus'); input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]pdf$') test_cases = [] - 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): - test_cases.append((input_filename, source_dir)) - if options.num_workers > 1: + if len(args): + for file_name in args: + input_path = os.path.join(walk_from_dir, file_name) + if not os.path.isfile(input_path): + print "Can't find test file '%s'" % file_name + return 1 + + test_cases.append((os.path.basename(input_path), + os.path.dirname(input_path))) + else: + 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): + test_cases.append((input_filename, source_dir)) + + if options.num_workers > 1 and len(test_cases) > 1: try: pool = multiprocessing.Pool(options.num_workers) worker_func = functools.partial(test_one_file_parallel, working_dir, diff --git a/testing/tools/run_javascript_tests.py b/testing/tools/run_javascript_tests.py index f9344a145f..e2fdc66918 100755 --- a/testing/tools/run_javascript_tests.py +++ b/testing/tools/run_javascript_tests.py @@ -42,6 +42,7 @@ 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() + finder = common.DirectoryFinder(options.build_dir) fixup_path = finder.ScriptPath('fixup_pdf_template.py') text_diff_path = finder.ScriptPath('text_diff.py') @@ -55,9 +56,16 @@ def main(): if not os.path.exists(working_dir): os.makedirs(working_dir) + input_files = [] + if len(args): + for file_name in args: + input_files.append(file_name.replace(".pdf", ".in")) + else: + input_files = os.listdir(source_dir) + failures = [] input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]in$') - for input_filename in os.listdir(source_dir): + for input_filename in input_files: if input_file_re.match(input_filename): input_path = os.path.join(source_dir, input_filename) if os.path.isfile(input_path): diff --git a/testing/tools/run_pixel_tests.py b/testing/tools/run_pixel_tests.py index c65a67aa17..b167923b86 100755 --- a/testing/tools/run_pixel_tests.py +++ b/testing/tools/run_pixel_tests.py @@ -66,9 +66,16 @@ def main(): test_suppressor = suppressor.Suppressor(finder) image_differ = pngdiffer.PNGDiffer(finder) + input_files = [] + if len(args): + for file_name in args: + input_files.append(file_name.replace(".pdf", ".in")) + else: + input_files = os.listdir(source_dir) + failures = [] input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]in$') - for input_filename in os.listdir(source_dir): + for input_filename in input_files: if input_file_re.match(input_filename): input_path = os.path.join(source_dir, input_filename) if os.path.isfile(input_path): |