i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Kernel Debugger tests

Browse Source 
Change-Id: I2a66b95931ac4a5ebe998bc11a1f59dfd2c667a4
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10672
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Kacper Kasper
2026-04-07 13:16:46 +00:00
parent cebd4714ed
commit b3f01a5118
5 changed files with 71 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/add-ons/kernel/debugger/DemangleTest.cpp
+56 -66
View File
@@ -4,76 +4,66 @@
*/
#include "DemangleTest.h"
#include <cppunit/TestCaller.h>
#include <cppunit/TestSuite.h>
#include <TestSuiteAddon.h>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
#include <String.h>
#include "Demangler.h"
#include "demangle.h"
DemangleTest::DemangleTest()
{
}
class DemangleTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(DemangleTest);
CPPUNIT_TEST(GCC2);
CPPUNIT_TEST(GCC3P);
CPPUNIT_TEST_SUITE_END();
public:
void GCC2()
{
// Long and complex things
CPPUNIT_ASSERT_EQUAL(
BString("BPrivate::IconCache::SyncDraw(BPrivate::Model*, BView*, BPoint, BPrivate::IconDrawMode, icon_size, void*, void*)"),
Demangler::Demangle("SyncDraw__Q28BPrivate9IconCachePQ28BPrivate5ModelP5BViewG6BPointQ28BPrivate12IconDrawMode9icon_sizePFP5BViewG6BPointP7BBitmapPv_vPv"));
CPPUNIT_ASSERT_EQUAL(
BString("BPrivate::BContainerWindow::UpdateMenu(BMenu*, BPrivate::BContainerWindow::UpdateMenuContext)"),
Demangler::Demangle("UpdateMenu__Q28BPrivate16BContainerWindowP5BMenuQ38BPrivate16BContainerWindow17UpdateMenuContext"));
CPPUNIT_ASSERT_EQUAL(
BString("icu_57::BreakIterator::registerInstance(icu_57::BreakIterator*, icu_57::Locale&, UBreakIteratorType, UErrorCode&)"),
Demangler::Demangle("registerInstance__Q26icu_5713BreakIteratorPQ26icu_5713BreakIteratorRCQ26icu_576Locale18UBreakIteratorTypeR10UErrorCode"));
// Previously caused crashes
CPPUNIT_ASSERT_EQUAL(
BString("_GLOBAL_::SetTo()"),
Demangler::Demangle("SetTo__Q282_GLOBAL_"));
}
void GCC3P()
{
// Long and complex things
CPPUNIT_ASSERT_EQUAL(
BString("BPrivate::IconCache::SyncDraw(BPrivate::Model*, BView*, BPoint, BPrivate::IconDrawMode, icon_size, void (*)(BView*, BPoint, BBitmap*, void*), void*)"),
Demangler::Demangle("_ZN8BPrivate9IconCache8SyncDrawEPNS_5ModelEP5BView6BPointNS_12IconDrawModeE9icon_sizePFvS4_S5_P7BBitmapPvESA_"));
CPPUNIT_ASSERT_EQUAL(
BString("BPrivate::BContainerWindow::UpdateMenu(BMenu*, BPrivate::BContainerWindow::UpdateMenuContext)"),
Demangler::Demangle("_ZN8BPrivate16BContainerWindow10UpdateMenuEP5BMenuNS0_17UpdateMenuContextE"));
CPPUNIT_ASSERT_EQUAL(
BString("icu_57::BreakIterator::registerInstance(icu_57::BreakIterator*, icu_57::Locale const&, UBreakIteratorType, UErrorCode&)"),
Demangler::Demangle("_ZN6icu_5713BreakIterator16registerInstanceEPS0_RKNS_6LocaleE18UBreakIteratorTypeR10UErrorCode"));
CPPUNIT_ASSERT_EQUAL(
BString("void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag) [clone .isra.25]"),
Demangler::Demangle("_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag.isra.25"));
CPPUNIT_ASSERT_EQUAL(
BString("foo(int) [clone .part.1.123456] [clone .constprop.777.54321]"),
Demangler::Demangle("_Z3fooi.part.1.123456.constprop.777.54321"));
// Names independent of the full symbol
char buffer[1024];
demangle_symbol_gcc3("_Z3fooi.part.1.123456.constprop.777.1", buffer, sizeof(buffer), NULL);
CPPUNIT_ASSERT_EQUAL(BString("foo[clone .part.1.123456] [clone .constprop.777.1] "), BString(buffer));
}
};
DemangleTest::~DemangleTest()
{
}
#define TEST(expect, input) \
NextSubTest(); \
CPPUNIT_ASSERT_EQUAL(BString(expect), Demangler::Demangle(input))
void
DemangleTest::RunGCC2Tests()
{
// Long and complex things
TEST("BPrivate::IconCache::SyncDraw(BPrivate::Model*, BView*, BPoint, BPrivate::IconDrawMode, icon_size, void*, void*)",
"SyncDraw__Q28BPrivate9IconCachePQ28BPrivate5ModelP5BViewG6BPointQ28BPrivate12IconDrawMode9icon_sizePFP5BViewG6BPointP7BBitmapPv_vPv");
TEST("BPrivate::BContainerWindow::UpdateMenu(BMenu*, BPrivate::BContainerWindow::UpdateMenuContext)",
"UpdateMenu__Q28BPrivate16BContainerWindowP5BMenuQ38BPrivate16BContainerWindow17UpdateMenuContext");
TEST("icu_57::BreakIterator::registerInstance(icu_57::BreakIterator*, icu_57::Locale&, UBreakIteratorType, UErrorCode&)",
"registerInstance__Q26icu_5713BreakIteratorPQ26icu_5713BreakIteratorRCQ26icu_576Locale18UBreakIteratorTypeR10UErrorCode");
// Previously caused crashes
TEST("_GLOBAL_::SetTo()", "SetTo__Q282_GLOBAL_");
}
void
DemangleTest::RunGCC3PTests()
{
// Long and complex things
TEST("BPrivate::IconCache::SyncDraw(BPrivate::Model*, BView*, BPoint, BPrivate::IconDrawMode, icon_size, void (*)(BView*, BPoint, BBitmap*, void*), void*)",
"_ZN8BPrivate9IconCache8SyncDrawEPNS_5ModelEP5BView6BPointNS_12IconDrawModeE9icon_sizePFvS4_S5_P7BBitmapPvESA_");
TEST("BPrivate::BContainerWindow::UpdateMenu(BMenu*, BPrivate::BContainerWindow::UpdateMenuContext)",
"_ZN8BPrivate16BContainerWindow10UpdateMenuEP5BMenuNS0_17UpdateMenuContextE");
TEST("icu_57::BreakIterator::registerInstance(icu_57::BreakIterator*, icu_57::Locale const&, UBreakIteratorType, UErrorCode&)",
"_ZN6icu_5713BreakIterator16registerInstanceEPS0_RKNS_6LocaleE18UBreakIteratorTypeR10UErrorCode");
TEST("void std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_construct<char*>(char*, char*, std::forward_iterator_tag) [clone .isra.25]",
"_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag.isra.25");
TEST("foo(int) [clone .part.1.123456] [clone .constprop.777.54321]", "_Z3fooi.part.1.123456.constprop.777.54321");
// Names independent of the full symbol
char buffer[1024];
NextSubTest();
demangle_symbol_gcc3("_Z3fooi.part.1.123456.constprop.777.1", buffer, sizeof(buffer), NULL);
CPPUNIT_ASSERT_EQUAL(BString("foo[clone .part.1.123456] [clone .constprop.777.1] "), buffer);
}
#undef TEST
/* static */ void
DemangleTest::AddTests(BTestSuite& parent)
{
CppUnit::TestSuite& suite = *new CppUnit::TestSuite("DemangleTest");
suite.addTest(new CppUnit::TestCaller<DemangleTest>(
"DemangleTest::RunGCC2Tests", &DemangleTest::RunGCC2Tests));
suite.addTest(new CppUnit::TestCaller<DemangleTest>(
"DemangleTest::RunGCC3+Tests", &DemangleTest::RunGCC3PTests));
parent.addTest("DemangleTest", &suite);
}
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(DemangleTest, getTestSuiteName());
src/tests/add-ons/kernel/debugger/DemangleTest.h
-25
View File
@@ -1,25 +0,0 @@
/*
* Copyright 2018, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef DEMANGLE_TEST
#define DEMANGLE_TEST
#include <TestCase.h>
#include <TestSuite.h>
class DemangleTest : public BTestCase {
public:
DemangleTest();
virtual ~DemangleTest();
void RunGCC2Tests();
void RunGCC3PTests();
static void AddTests(BTestSuite& suite);
};
#endif // DEMANGLE_TEST
src/tests/add-ons/kernel/debugger/Jamfile
+1 -1
View File
@@ -4,7 +4,7 @@ SubDirHdrs $(HAIKU_TOP) src kits debugger demangler ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel debugger demangle ;
UnitTestLib libkerneldebuggertest.so :
KernelDebuggerTest.cpp
KernelDebuggerTestAddon.cpp
DemangleTest.cpp
src/tests/add-ons/kernel/debugger/KernelDebuggerTest.cpp
-22
View File
@@ -1,22 +0,0 @@
/*
* Copyright 2018, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <TestSuite.h>
#include <TestSuiteAddon.h>
#include "DemangleTest.h"
BTestSuite*
getTestSuite()
{
BTestSuite* suite = new BTestSuite("KernelDebuggerTest");
DemangleTest::AddTests(*suite);
return suite;
}
src/tests/add-ons/kernel/debugger/KernelDebuggerTestAddon.cpp
+14
View File
@@ -0,0 +1,14 @@
/*
* Copyright 2018, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#include <TestSuiteAddon.h>
const char*
getTestSuiteName()
{
return "KernelDebugger";
}