gdb: fix some clang-tidy readability-misleading-indentation warnings

[binutils-gdb.git] / gdb / selftest-arch.c

diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c
index 522b1daf4f425d44997cb4a7dc3dc6b7ac101a33..1375838b0c26a6aba0917078802b975644f91c6f 100644 (file)
--- a/gdb/selftest-arch.c
+++ b/gdb/selftest-arch.c
@@ -1,5 +1,5 @@
 /* GDB self-test for each gdbarch.
-   Copyright (C) 2017 Free Software Foundation, Inc.
+   Copyright (C) 2017-2022 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,20 +17,66 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
+#include <functional>
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "arch-utils.h"
 
 namespace selftests {
 
-static std::vector<self_test_foreach_arch_function *> gdbarch_tests;
+static bool skip_arch (const char *arch)
+{
+  if (strcmp ("fr300", arch) == 0)
+    {
+      /* PR 20946 */
+      return true;
+    }
+
+  if (strcmp ("powerpc:EC603e", arch) == 0
+      || strcmp ("powerpc:e500mc", arch) == 0
+      || strcmp ("powerpc:e500mc64", arch) == 0
+      || strcmp ("powerpc:titan", arch) == 0
+      || strcmp ("powerpc:vle", arch) == 0
+      || strcmp ("powerpc:e5500", arch) == 0
+      || strcmp ("powerpc:e6500", arch) == 0)
+    {
+      /* PR 19797 */
+      return true;
+    }
+
+  return false;
+}
+
+/* Register a kind of selftest that calls the test function once for each
+   gdbarch known to GDB.  */
 
 void
-register_test_foreach_arch (self_test_foreach_arch_function *function)
+register_test_foreach_arch (const std::string &name,
+                           self_test_foreach_arch_function *function)
 {
-  gdbarch_tests.push_back (function);
+  std::vector<const char *> arches = gdbarch_printable_names ();
+  for (const char *arch : arches)
+    {
+      if (skip_arch (arch))
+       continue;
+
+      auto test_fn
+       = ([=] ()
+          {
+            struct gdbarch_info info;
+            info.bfd_arch_info = bfd_scan_arch (arch);
+            struct gdbarch *gdbarch = gdbarch_find_by_info (info);
+            SELF_CHECK (gdbarch != NULL);
+            function (gdbarch);
+            reset ();
+          });
+
+      std::string test_name
+       = name + std::string ("::") + std::string (arch);
+      register_test (test_name, test_fn);
+    }
 }
 
 void
@@ -40,70 +86,5 @@ reset ()
   registers_changed ();
   reinit_frame_cache ();
 }
-
-static void
-tests_with_arch ()
-{
-  int failed = 0;
-
-  for (const auto &f : gdbarch_tests)
-    {
-      const char **arches = gdbarch_printable_names ();
-
-      for (int i = 0; arches[i] != NULL; i++)
-       {
-         if (strcmp ("fr300", arches[i]) == 0)
-           {
-             /* PR 20946 */
-             continue;
-           }
-         else if (strcmp ("powerpc:EC603e", arches[i]) == 0
-                  || strcmp ("powerpc:e500mc", arches[i]) == 0
-                  || strcmp ("powerpc:e500mc64", arches[i]) == 0
-                  || strcmp ("powerpc:titan", arches[i]) == 0
-                  || strcmp ("powerpc:vle", arches[i]) == 0
-                  || strcmp ("powerpc:e5500", arches[i]) == 0
-                  || strcmp ("powerpc:e6500", arches[i]) == 0)
-           {
-             /* PR 19797 */
-             continue;
-           }
-
-         QUIT;
-
-         TRY
-           {
-             struct gdbarch_info info;
-
-             gdbarch_info_init (&info);
-             info.bfd_arch_info = bfd_scan_arch (arches[i]);
-
-             struct gdbarch *gdbarch = gdbarch_find_by_info (info);
-             SELF_CHECK (gdbarch != NULL);
-             f (gdbarch);
-           }
-         CATCH (ex, RETURN_MASK_ERROR)
-           {
-             ++failed;
-             exception_fprintf (gdb_stderr, ex,
-                                _("Self test failed: arch %s: "), arches[i]);
-           }
-         END_CATCH
-
-         reset ();
-       }
-    }
-
-  SELF_CHECK (failed == 0);
-}
-
 } // namespace selftests
 #endif /* GDB_SELF_TEST */
-
-void
-_initialize_selftests_foreach_arch ()
-{
-#if GDB_SELF_TEST
-  selftests::register_test (selftests::tests_with_arch);
-#endif
-}