Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-05 15:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

gdbsupport/selftest: Replace for_each_selftest with an iterator_range

Browse Source 
Remove the callback-based selftests::for_each_selftest function and use
an iterator_range instead.

Also use this iterator range in run_tests so all iterations over the
selftests are done in a consistent way.  This will become useful in a
later commit.

Change-Id: I0b3a5349a7987fbcb0071f11c394e353df986583
This commit is contained in:
Lancelot SIX
2022-03-23 15:29:53 +00:00
parent 2aaee75f81
commit c57207c15c
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gdbsupport/selftest.cc
View File

@@ -20,16 +20,15 @@
#include "common-exceptions.h"
#include "common-debug.h"
#include "selftest.h"
#include <map>
#include <functional>
namespace selftests
{
/* All the tests that have been registered. Using an std::map allows keeping
/* All the tests that have been registered. Using an std::set allows keeping
the order of tests stable and easily looking up whether a test name
exists. */
static std::map<std::string, std::function<void(void)>> tests;
static selftests_registry tests;
/* See selftest.h. */
@@ -38,9 +37,9 @@ register_test (const std::string &name,
std::function<void(void)> function)
{
/* Check that no test with this name already exist. */
gdb_assert (tests.find (name) == tests.end ());
tests[name] = function;
auto status = tests.emplace (name, std::move (function));
if (!status.second)
gdb_assert_not_reached ("Test already registered");
}
/* See selftest.h. */
@@ -63,10 +62,8 @@ run_tests (gdb::array_view<const char *const> filters, bool verbose)
int ran = 0, failed = 0;
run_verbose_ = verbose;
for (const auto &pair : tests)
for (const auto &test : all_selftests ())
{
const std::string &name = pair.first;
const auto &test = pair.second;
bool run = false;
if (filters.empty ())
@@ -75,7 +72,7 @@ run_tests (gdb::array_view<const char *const> filters, bool verbose)
{
for (const char *filter : filters)
{
if (name.find (filter) != std::string::npos)
if (test.name.find (filter) != std::string::npos)
run = true;
}
}
@@ -85,9 +82,9 @@ run_tests (gdb::array_view<const char *const> filters, bool verbose)
try
{
debug_printf (_("Running selftest %s.\n"), name.c_str ());
debug_printf (_("Running selftest %s.\n"), test.name.c_str ());
++ran;
test ();
test.test ();
}
catch (const gdb_exception_error &ex)
{
@@ -104,10 +101,10 @@ run_tests (gdb::array_view<const char *const> filters, bool verbose)
/* See selftest.h. */
void for_each_selftest (for_each_selftest_ftype func)
selftests_range
all_selftests ()
{
for (const auto &pair : tests)
func (pair.first);
return selftests_range (tests.cbegin (), tests.cend ());
}
} // namespace selftests