diff options
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/tools/common.py | 32 | ||||
| -rw-r--r-- | testing/tools/test_runner.py | 12 |
2 files changed, 2 insertions, 42 deletions
diff --git a/testing/tools/common.py b/testing/tools/common.py index a0cc946f1a..b6e4a7d62e 100755 --- a/testing/tools/common.py +++ b/testing/tools/common.py @@ -43,38 +43,6 @@ def RunCommandExtractHashedFiles(cmd): except subprocess.CalledProcessError as e: return e, None -# Adjust Dr. Memory wrapper to have separate log directory for each test -# for better error reporting. -def DrMemoryWrapper(wrapper, pdf_name): - if not wrapper: - return [] - # convert string to list - cmd_to_run = wrapper.split() - - # Do nothing if using default log directory. - if cmd_to_run.count("-logdir") == 0: - return cmd_to_run - # Usually, we pass "-logdir" "foo\bar\spam path" args to Dr. Memory. - # To group reports per test, we want to put the reports for each test into a - # separate directory. This code can be simplified when we have - # https://github.com/DynamoRIO/drmemory/issues/684 fixed. - logdir_idx = cmd_to_run.index("-logdir") - old_logdir = cmd_to_run[logdir_idx + 1] - wrapper_pid = str(os.getpid()) - - # We are using the same pid of the same python process, so append the number - # of entries in the logdir at the end of wrapper_pid to avoid conflict. - wrapper_pid += "_%d" % len(glob.glob(old_logdir + "\\*")) - - cmd_to_run[logdir_idx + 1] += "\\testcase.%s.logs" % wrapper_pid - os.makedirs(cmd_to_run[logdir_idx + 1]) - - f = open(old_logdir + "\\testcase.%s.name" % wrapper_pid, "w") - print >>f, pdf_name + ".pdf" - f.close() - - return cmd_to_run - class DirectoryFinder: '''A class for finding directories and paths under either a standalone diff --git a/testing/tools/test_runner.py b/testing/tools/test_runner.py index 7a64e0ddc3..6cd3a6c05a 100644 --- a/testing/tools/test_runner.py +++ b/testing/tools/test_runner.py @@ -107,9 +107,7 @@ class TestRunner: txt_path = os.path.join(self.working_dir, input_root + '.txt') with open(txt_path, 'w') as outfile: - # add Dr. Memory wrapper if exist - cmd_to_run = common.DrMemoryWrapper(self.drmem_wrapper, input_root) - cmd_to_run.extend([self.pdfium_test_path, pdf_path]) + cmd_to_run = [self.pdfium_test_path, pdf_path] subprocess.check_call(cmd_to_run, stdout=outfile) cmd = [sys.executable, self.text_diff_path, expected_txt_path, txt_path] @@ -117,8 +115,7 @@ class TestRunner: def TestPixel(self, input_root, pdf_path): - cmd_to_run = common.DrMemoryWrapper(self.drmem_wrapper, input_root) - cmd_to_run.extend([self.pdfium_test_path, '--send-events', '--png']) + cmd_to_run = [self.pdfium_test_path, '--send-events', '--png'] if self.gold_results: cmd_to_run.append('--md5') cmd_to_run.append(pdf_path) @@ -151,9 +148,6 @@ class TestRunner: dest='num_workers', type='int', help='run NUM_WORKERS jobs in parallel') - parser.add_option('--wrapper', default='', dest="wrapper", - help='wrapper for running test under Dr. Memory') - parser.add_option('--gold_properties', default='', dest="gold_properties", help='Key value pairs that are written to the top level of the JSON file that is ingested by Gold.') @@ -175,8 +169,6 @@ class TestRunner: self.fixup_path = finder.ScriptPath('fixup_pdf_template.py') self.text_diff_path = finder.ScriptPath('text_diff.py') - self.drmem_wrapper = options.wrapper - self.source_dir = finder.TestingDir() if self.test_dir != 'corpus': test_dir = finder.TestingDir(os.path.join('resources', self.test_dir)) |