TestFixture: immediately bail out when library could not be loaded

Author: firewave

test/fixture.cpp

@@ -73,7 +73,6 @@ unsigned int TestFixture::countTests;
 std::size_t TestFixture::fails_counter = 0;
 std::size_t TestFixture::todos_counter = 0;
 std::size_t TestFixture::succeeded_todos_counter = 0;
-std::set<std::string> TestFixture::missingLibs;
 
 TestFixture::TestFixture(const char * const _name)
     : mVerbose(false),
@@ -283,11 +282,6 @@ void TestFixture::assertNoThrowFail(const char * const filename, const unsigned
 
 }
 
-void TestFixture::complainMissingLib(const char * const libname)
-{
-    missingLibs.insert(libname);
-}
-
 void TestFixture::printHelp()
 {
     std::cout << "Testrunner - run Cppcheck tests\n"
@@ -356,12 +350,6 @@ std::size_t TestFixture::runTests(const options& args)
     std::cerr << "Tests failed: " << fails_counter << std::endl << std::endl;
     std::cerr << errmsg.str();
 
-    if (!missingLibs.empty()) {
-        std::cerr << "Missing libraries: ";
-        for (const std::string & missingLib : missingLibs)
-            std::cerr << missingLib << "  ";
-        std::cerr << std::endl << std::endl;
-    }
     std::cerr.flush();
     return fails_counter;
 }

test/fixture.h

@@ -39,7 +39,6 @@ class TestFixture : public ErrorLogger {
     static std::size_t fails_counter;
     static std::size_t todos_counter;
     static std::size_t succeeded_todos_counter;
-    static std::set<std::string> missingLibs;
     bool mVerbose;
     std::string mTemplateFormat;
     std::string mTemplateLocation;
@@ -91,7 +90,6 @@ class TestFixture : public ErrorLogger {
     void assertThrow(const char * const filename, const unsigned int linenr) const;
     void assertThrowFail(const char * const filename, const unsigned int linenr) const;
     void assertNoThrowFail(const char * const filename, const unsigned int linenr) const;
-    static void complainMissingLib(const char * const libname);
     static std::string deleteLineNumber(const std::string &message);
 
     void setVerbose(bool v) {
@@ -159,12 +157,7 @@ extern std::ostringstream output;
 #define EXPECT_EQ( EXPECTED, ACTUAL ) assertEquals(__FILE__, __LINE__, EXPECTED, ACTUAL)
 #define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance_ ## CLASSNAME; }
 
-#define LOAD_LIB_2( LIB, NAME ) do { \
-        if (((LIB).load(exename.c_str(), NAME).errorcode != Library::ErrorCode::OK)) { \
-            complainMissingLib(NAME); \
-            return; \
-        } \
-} while (false)
+#define LOAD_LIB_2( LIB, NAME ) do { if (((LIB).load(exename.c_str(), NAME).errorcode != Library::ErrorCode::OK)) throw std::runtime_error("library '" + std::string(NAME) + "' not found"); } while (false)
 
 #define PLATFORM( S, P ) do { std::string errstr; assertEquals(__FILE__, __LINE__, true, S.platform(cppcheck::Platform::platformString(P), errstr, {exename}), errstr); } while (false)