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

unittests: skip loading non-.so files

Browse Source 
* If any other file got into lib directory it would hang the runner.

Change-Id: I29e8a975d0366c732469fb444b9d23d6c2523c97
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10675
Reviewed-by: Kacper Kasper <[email protected]>
This commit is contained in:
Kacper Kasper
2026-04-07 13:16:46 +00:00
parent 499154375f
commit 26060c6792
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/cppunit/TestShell.cpp
+16 -4
View File
@@ -10,6 +10,7 @@
#include <image.h> #include <image.h>
#include <Locker.h> #include <Locker.h>
#include <Path.h> #include <Path.h>
#include <String.h>
#include <TLS.h> #include <TLS.h>
#include <cppunit/Exception.h> #include <cppunit/Exception.h>
@@ -139,9 +140,15 @@ BTestShell::LoadSuitesFrom(BDirectory *libDir) {
while (libDir->GetNextEntry(&addonEntry, true) == B_OK) { while (libDir->GetNextEntry(&addonEntry, true) == B_OK) {
status_t err; status_t err;
status_t addonStatus = B_ERROR; status_t addonStatus = B_ERROR;
bool getTestSuiteFound = false;
err = addonEntry.GetPath(&addonPath); err = addonEntry.GetPath(&addonPath);
if (!err) { if (!err) {
cout << "Checking " << addonPath.Path() << "..." << endl; cout << "Checking " << addonPath.Path() << "";
BString filename(addonPath.Leaf());
if (!filename.EndsWith(".so")) {
cout << ", wrong extension. Skipping." << endl;
continue;
}
addonImage = load_add_on(addonPath.Path()); addonImage = load_add_on(addonPath.Path());
addonStatus = (addonImage >= 0 ? B_OK : B_ERROR); addonStatus = (addonImage >= 0 ? B_OK : B_ERROR);
} }
@@ -149,9 +156,11 @@ BTestShell::LoadSuitesFrom(BDirectory *libDir) {
err = get_image_symbol(addonImage, "getTestSuite", err = get_image_symbol(addonImage, "getTestSuite",
B_SYMBOL_TYPE_TEXT, reinterpret_cast<void **>(&func)); B_SYMBOL_TYPE_TEXT, reinterpret_cast<void **>(&func));
} else { } else {
// cout << " getTestSuite error == " << err << endl; // cout << ", getTestSuite error == " << err << endl;
} }
if (err == B_OK) { if (err == B_OK) {
cout << ", found getTestSuite()";
getTestSuiteFound = true;
err = AddSuite(func()); err = AddSuite(func());
if (err == B_OK) if (err == B_OK)
count++; count++;
@@ -160,15 +169,18 @@ BTestShell::LoadSuitesFrom(BDirectory *libDir) {
err = get_image_symbol(addonImage, "getTestSuiteName", err = get_image_symbol(addonImage, "getTestSuiteName",
B_SYMBOL_TYPE_TEXT, reinterpret_cast<void **>(&nameF)); B_SYMBOL_TYPE_TEXT, reinterpret_cast<void **>(&nameF));
if(err == B_OK) { if(err == B_OK) {
cout << ", found getTestSuiteName()";
const char* testSuiteName = nameF(); const char* testSuiteName = nameF();
CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry &registry =
CppUnit::TestFactoryRegistry::getRegistry(testSuiteName); CppUnit::TestFactoryRegistry::getRegistry(testSuiteName);
AddSuite(static_cast<CppUnit::TestSuite*>(registry.makeTest())); AddSuite(static_cast<CppUnit::TestSuite*>(registry.makeTest()));
count++; count++;
} else { } else if (!getTestSuiteFound) {
// cout << " getTestSuiteName error == " << err << endl; cout << ", getTestSuiteName error == " << err << endl;
continue;
} }
} }
cout << ", OK." << endl;
} }
return count; return count;
} }