From 98367f3ef7dc76c856db1c8a3721bef5f9b7adfc Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 13 Aug 2015 11:32:36 -0700 Subject: Revert "Allow external font-path configuration from pdfium_test." This reverts commit d8b5e73d8609b74e6a995ee1768d20d47bd4b089. Broke corpus tests TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1292153002 . --- testing/tools/run_corpus_tests.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'testing/tools/run_corpus_tests.py') diff --git a/testing/tools/run_corpus_tests.py b/testing/tools/run_corpus_tests.py index d33a14971c..28616fb531 100755 --- a/testing/tools/run_corpus_tests.py +++ b/testing/tools/run_corpus_tests.py @@ -21,14 +21,13 @@ import suppressor # c_dir - "path/to/a/b/c" def test_one_file(input_filename, source_dir, working_dir, - pdfium_test_path, font_dir, image_differ): + pdfium_test_path, image_differ): input_path = os.path.join(source_dir, input_filename) pdf_path = os.path.join(working_dir, input_filename) try: shutil.copyfile(input_path, pdf_path) sys.stdout.flush() - subprocess.check_call([pdfium_test_path, '--font-dir=' + font_dir, - '--png', pdf_path]) + subprocess.check_call([pdfium_test_path, '--png', pdf_path]) except subprocess.CalledProcessError as e: print "FAILURE: " + input_filename + "; " + str(e) return False @@ -58,7 +57,6 @@ def main(): failures = [] surprises = [] walk_from_dir = finder.TestingDir('corpus'); - font_dir = os.path.join(walk_from_dir, 'fonts'); 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: @@ -66,7 +64,7 @@ def main(): input_path = os.path.join(source_dir, input_filename) if os.path.isfile(input_path): result = test_one_file(input_filename, source_dir, working_dir, - pdfium_test_path, font_dir, image_differ) + pdfium_test_path, image_differ) if test_suppressor.IsSuppressed(input_filename): if result: surprises.append(input_path) -- cgit v1.2.3