Fixup test harness

When the results of the test runner were converted to return a tuple the
following code which checked the results for true/false were not updated
to extract the success value from the tuple. This caused the code to think
that the results always passed even when they failed.

This CL fixes the two tests which were broken (both just minor image result
differences) which slipped in during this breakage.

Change-Id: I01b56dd7b05013c2c12c83543746cf59b145e561
Reviewed-on: https://pdfium-review.googlesource.com/2456
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

2 files changed, 10 insertions, 5 deletions

diff --git a/testing/tools/suppressor.py b/testing/tools/suppressor.py
index b7629ef6f8..86d2668adb 100755
--- a/testing/tools/suppressor.py
+++ b/testing/tools/suppressor.py
@@ -12,8 +12,10 @@ class Suppressor:
     feature_vector = feature_string.strip().split(",")
     self.has_v8 = "V8" in feature_vector
     self.has_xfa = "XFA" in feature_vector
+    self.is_asan = "ASAN" in feature_vector
     v8_option = "v8" if self.has_v8 else "nov8"
     xfa_option = "xfa" if self.has_xfa else "noxfa"
+
     with open(os.path.join(finder.TestingDir(), 'SUPPRESSIONS')) as f:
       self.suppression_set = set(self._FilterSuppressions(
         common.os_name(), v8_option, xfa_option, self._ExtractSuppressions(f)))
@@ -31,6 +33,8 @@ class Suppressor:
     os_column = item[1].split(",");
     js_column = item[2].split(",");
     xfa_column = item[3].split(",");
+    if self.is_asan and 'asan' in os_column:
+      return True
     return (('*' in os_column or os in os_column) and
             ('*' in js_column or js in js_column) and
             ('*' in xfa_column or xfa in xfa_column))
diff --git a/testing/tools/test_runner.py b/testing/tools/test_runner.py
index 3a31709be4..7a64e0ddc3 100644
--- a/testing/tools/test_runner.py
+++ b/testing/tools/test_runner.py
@@ -125,8 +125,8 @@ class TestRunner:
     return common.RunCommandExtractHashedFiles(cmd_to_run)
 
   def HandleResult(self, input_filename, input_path, result):
+    success, image_paths = result
     if self.gold_results:
-      success, image_paths = result
       if image_paths:
         for img_path, md5_hash in image_paths:
           # the output filename (without extension becomes the test name)
@@ -134,10 +134,10 @@ class TestRunner:
           self.gold_results.AddTestResult(test_name, md5_hash, img_path)
 
     if self.test_suppressor.IsResultSuppressed(input_filename):
-      if result:
+      if success:
         self.surprises.append(input_path)
     else:
-      if not result:
+      if not success:
         self.failures.append(input_path)
 
 
@@ -271,6 +271,7 @@ class TestRunner:
       print '\n\nSummary of Failures:'
       for failure in self.failures:
         print failure
-        if not options.ignore_errors:
-          return 1
+
+      if not options.ignore_errors:
+        return 1
     return 0