summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-09-09 13:05:42 -0700
committerLei Zhang <thestig@chromium.org>2015-09-09 13:05:42 -0700
commit77aaf96a165272ab52916c04b5ec69e4f2fd13de (patch)
tree13780e258aaacc1dd55784d16cc16d5557866d90
parent396e872d872b760813036b7e7dd8bb68a8b61598 (diff)
downloadpdfium-77aaf96a165272ab52916c04b5ec69e4f2fd13de.tar.xz
Merge to XFA: Remove existing generated images before running a test.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1314443007 . (cherry picked from commit 8ead9036aab18d45498e310866210dfff20da188) Review URL: https://codereview.chromium.org/1331643004 .
-rwxr-xr-xtesting/tools/pngdiffer.py42
-rwxr-xr-xtesting/tools/run_corpus_tests.py9
-rwxr-xr-xtesting/tools/run_pixel_tests.py10
3 files changed, 54 insertions, 7 deletions
diff --git a/testing/tools/pngdiffer.py b/testing/tools/pngdiffer.py
index 7a7e8ddbc6..35eaaa437a 100755
--- a/testing/tools/pngdiffer.py
+++ b/testing/tools/pngdiffer.py
@@ -16,14 +16,33 @@ class PNGDiffer():
self.pdfium_diff_path = finder.ExecutablePath('pdfium_diff')
self.os_name = finder.os_name
+ def GetActualFiles(self, input_filename, source_dir, working_dir):
+ actual_paths = []
+ template_paths = self._GetTemplatePaths(
+ input_filename, source_dir, working_dir)
+ actual_path_template = template_paths[0];
+ expected_path_template = template_paths[1]
+ platform_expected_path_template = template_paths[2]
+ i = 0
+ 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):
+ break
+ actual_paths.append(actual_path)
+ i += 1
+ return actual_paths
+
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)
+ template_paths = self._GetTemplatePaths(
+ input_filename, source_dir, working_dir)
+ actual_path_template = template_paths[0];
+ expected_path_template = template_paths[1]
+ platform_expected_path_template = template_paths[2]
i = 0
try:
while True:
@@ -46,3 +65,12 @@ class PNGDiffer():
print "FAILURE: " + input_filename + "; " + str(e)
return True
return False
+
+ def _GetTemplatePaths(self, input_filename, source_dir, working_dir):
+ input_root, _ = os.path.splitext(input_filename)
+ actual_path = os.path.join(working_dir, input_root + self.ACTUAL_TEMPLATE)
+ expected_path = os.path.join(
+ source_dir, input_root + self.EXPECTED_TEMPLATE)
+ platform_expected_path = os.path.join(
+ source_dir, input_root + self.PLATFORM_EXPECTED_TEMPLATE)
+ return (actual_path, expected_path, platform_expected_path)
diff --git a/testing/tools/run_corpus_tests.py b/testing/tools/run_corpus_tests.py
index 28616fb531..0dadd52d19 100755
--- a/testing/tools/run_corpus_tests.py
+++ b/testing/tools/run_corpus_tests.py
@@ -24,6 +24,14 @@ def test_one_file(input_filename, source_dir, working_dir,
pdfium_test_path, image_differ):
input_path = os.path.join(source_dir, input_filename)
pdf_path = os.path.join(working_dir, input_filename)
+
+ # Remove any existing generated images from previous runs.
+ actual_images = image_differ.GetActualFiles(
+ input_filename, source_dir, working_dir)
+ for image in actual_images:
+ if os.path.exists(image):
+ os.remove(image)
+
try:
shutil.copyfile(input_path, pdf_path)
sys.stdout.flush()
@@ -35,6 +43,7 @@ def test_one_file(input_filename, source_dir, working_dir,
return False
return True
+
def main():
parser = optparse.OptionParser()
parser.add_option('--build-dir', default=os.path.join('out', 'Debug'),
diff --git a/testing/tools/run_pixel_tests.py b/testing/tools/run_pixel_tests.py
index 98e8916cc0..c65a67aa17 100755
--- a/testing/tools/run_pixel_tests.py
+++ b/testing/tools/run_pixel_tests.py
@@ -24,6 +24,14 @@ def generate_and_test(input_filename, source_dir, working_dir,
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')
+
+ # Remove any existing generated images from previous runs.
+ actual_images = image_differ.GetActualFiles(
+ input_filename, source_dir, working_dir)
+ for image in actual_images:
+ if os.path.exists(image):
+ os.remove(image)
+
try:
sys.stdout.flush()
subprocess.check_call(
@@ -37,6 +45,7 @@ def generate_and_test(input_filename, source_dir, working_dir,
return False
return True
+
def main():
parser = optparse.OptionParser()
parser.add_option('--build-dir', default=os.path.join('out', 'Debug'),
@@ -77,5 +86,6 @@ def main():
return 1
return 0
+
if __name__ == '__main__':
sys.exit(main())