From: Wojciech Staszkiewicz <staszkiewicz@google.com>
Date: Wed, 28 Sep 2016 23:15:50 +0000 (-0700)
Subject: Fix true divergence mode
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b2a3d3d4fcd63b11b1f402613bee4ee085971c47;p=android-x86%2Fart.git

Fix true divergence mode

Do not report TIMEOUT divergences in true divergence mode.

Test: ./run_jfuzz_test.py
Change-Id: I65e48ee6b3d90de0ba997a48b85445312cb0661f
---

diff --git a/tools/jfuzz/run_jfuzz_test.py b/tools/jfuzz/run_jfuzz_test.py
index 54f9bb494..fd8415d3a 100755
--- a/tools/jfuzz/run_jfuzz_test.py
+++ b/tools/jfuzz/run_jfuzz_test.py
@@ -450,13 +450,13 @@ class JFuzzTester(object):
     os.mkdir(ddir)
     for f in glob('*.txt') + ['Test.java']:
       shutil.copy(f, ddir)
-    # Maybe run bisection bug search.
-    if (retc1 in BISECTABLE_RET_CODES and retc2 in BISECTABLE_RET_CODES and
-        not (self._true_divergence_only and RetCode.TIMEOUT in (retc1, retc2))):
-      self.MaybeBisectDivergence(retc1, retc2, is_output_divergence)
-    # Call reporting script.
-    if self._report_script:
-      self.RunReportScript(retc1, retc2, is_output_divergence)
+    if not (self._true_divergence_only and RetCode.TIMEOUT in (retc1, retc2)):
+      # Maybe run bisection bug search.
+      if retc1 in BISECTABLE_RET_CODES and retc2 in BISECTABLE_RET_CODES:
+        self.MaybeBisectDivergence(retc1, retc2, is_output_divergence)
+      # Call reporting script.
+      if self._report_script:
+        self.RunReportScript(retc1, retc2, is_output_divergence)
 
   def RunReportScript(self, retc1, retc2, is_output_divergence):
     """Runs report script."""