Revert of Combined test runner. (patchset #2 id:20001 of https://codereview.chromium.org/1850273003/ )
Reason for revert:
Broke Dr. Memory
Original issue's description:
> Combined test runner.
>
> This CL revives the old CL to combine the test runners [1] which was reverted
> due to failing font_size tests. I've deleted the font_size.pdf as it is not
> needed and for testing. Pixel tests are either .in or .pdf files, not both.
>
> Original description:
> This CL takes the three test runners (corpus, javascript, pixel) and combines
> the code into a single test_runner file. Each of the individual runners still
> exists and calls the test runner with their data directory.
>
> With this change, the pixel and javascript test will now run in parallel if
> multiple processors are available.
>
> 1-https://codereview.chromium.org/1430623006/
>
> Committed: https://pdfium.googlesource.com/pdfium/+/03e8f12cd3788038225d0376a164a9993f6cb720
TBR=tsepez@chromium.org,thestig@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1867643002
diff --git a/testing/tools/run_javascript_tests.py b/testing/tools/run_javascript_tests.py
index 76d2379..b09ea49 100755
--- a/testing/tools/run_javascript_tests.py
+++ b/testing/tools/run_javascript_tests.py
@@ -3,13 +3,97 @@
# 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
-import test_runner
+import common
+
+# 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, text_diff_path,
+ drmem_wrapper):
+ 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(
+ [sys.executable, fixup_path, '--output-dir=' + working_dir, input_path])
+ with open(txt_path, 'w') as outfile:
+ # add Dr. Memory wrapper if exist
+ cmd_to_run = common.DrMemoryWrapper(drmem_wrapper, input_root)
+ cmd_to_run.extend([pdfium_test_path, pdf_path])
+ # run test
+ subprocess.check_call(cmd_to_run, stdout=outfile)
+ 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
+ return True
def main():
- runner = test_runner.TestRunner('javascript')
- return runner.Run()
+ parser = optparse.OptionParser()
+ parser.add_option('--build-dir', default=os.path.join('out', 'Debug'),
+ help='relative path from the base source directory')
+ parser.add_option('--wrapper', default='', dest="wrapper",
+ help='Dr. Memory wrapper for running test under Dr. Memory')
+ 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')
+ source_dir = finder.TestingDir(os.path.join('resources', 'javascript'))
+ pdfium_test_path = finder.ExecutablePath('pdfium_test')
+ if not os.path.exists(pdfium_test_path):
+ print "FAILURE: Can't find test executable '%s'" % pdfium_test_path
+ print "Use --build-dir to specify its location."
+ return 1
+ working_dir = finder.WorkingDir(os.path.join('testing', 'javascript'))
+ if not os.path.exists(working_dir):
+ os.makedirs(working_dir)
+
+ feature_string = subprocess.check_output([pdfium_test_path, '--show-config'])
+ if "V8" not in feature_string.strip().split(","):
+ print "V8 not enabled, skipping."
+ return 0
+
+ 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 input_files:
+ 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, text_diff_path,
+ options.wrapper):
+ failures.append(input_path)
+
+ if failures:
+ failures.sort()
+ print '\n\nSummary of Failures:'
+ for failure in failures:
+ print failure
+ return 1
+ return 0
+
if __name__ == '__main__':
sys.exit(main())