Revert "Disable test reruns on arm unless explicitly marked with --rerun-all-issues"

and
Revert "prevent rerun logic from kicking in on test runs including aarch64."

This reverts commits:
r255719
r255747

llvm-svn: 255935

1 files changed, 2 insertions, 7 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/result_formatter.py b/lldb/packages/Python/lldbsuite/test/result_formatter.py
index 7b5fcc9e223..35b3617e1c8 100644
--- a/lldb/packages/Python/lldbsuite/test/result_formatter.py
+++ b/lldb/packages/Python/lldbsuite/test/result_formatter.py
@@ -762,13 +762,8 @@ class ResultsFormatter(object):
     def _maybe_add_test_to_rerun_list(self, result_event):
         key = self._make_key(result_event)
         if key is not None:
-            test_is_directly_eligible = (
-                key in self.rerun_eligible_tests and
-                # llvm.org/pr25844 workaround: temporarily prevent
-                # rerun eligibility when building for Android.
-                "aarch64" not in configuration.archs and
-                "arm" not in configuration.archs)
-            if (test_is_directly_eligible or configuration.rerun_all_issues):
+            if (key in self.rerun_eligible_tests or
+                    configuration.rerun_all_issues):
                 test_filename = result_event.get("test_filename", None)
                 if test_filename is not None:
                     test_name = result_event.get("test_name", None)