testrunner: reduced usage of mutable Settings / some cleanups (danm…

…ar#5909)

test/fixture.cpp

@@ -461,9 +461,11 @@ TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::platform(Platform::T
 TestFixture::SettingsBuilder& TestFixture::SettingsBuilder::libraryxml(const char xmldata[], std::size_t len)
 {
     tinyxml2::XMLDocument doc;
-    if (tinyxml2::XML_SUCCESS != doc.Parse(xmldata, len))
-        throw std::runtime_error("loading XML data failed");
-    if (settings.library.load(doc).errorcode != Library::ErrorCode::OK)
-        throw std::runtime_error("loading library XML failed");
+    const tinyxml2::XMLError xml_error = doc.Parse(xmldata, len);
+    if (tinyxml2::XML_SUCCESS != xml_error)
+        throw std::runtime_error(std::string("loading XML data failed - ") + tinyxml2::XMLDocument::ErrorIDToName(xml_error));
+    const Library::ErrorCode lib_error = settings.library.load(doc).errorcode;
+    if (lib_error != Library::ErrorCode::OK)
+        throw std::runtime_error("loading library XML failed - " + std::to_string(static_cast<int>(lib_error)));
     return *this;
 }

test/fixture.h

@@ -282,7 +282,6 @@ class TestFixture : public ErrorLogger {
 #define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance_ ## CLASSNAME; }
 
 #define LOAD_LIB_2_EXE( LIB, NAME, EXE ) do { if (((LIB).load((EXE), NAME).errorcode != Library::ErrorCode::OK)) throw std::runtime_error("library '" + std::string(NAME) + "' not found"); } while (false)
-#define LOAD_LIB_2( LIB, NAME ) LOAD_LIB_2_EXE(LIB, NAME, exename.c_str())
 
 #define PLATFORM( P, T ) do { std::string errstr; assertEquals(__FILE__, __LINE__, true, P.set(Platform::toString(T), errstr, {exename}), errstr); } while (false)
 

test/testbufferoverrun.cpp

@@ -38,7 +38,7 @@ class TestBufferOverrun : public TestFixture {
     TestBufferOverrun() : TestFixture("TestBufferOverrun") {}
 
 private:
-    Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
+    /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     void check_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
@@ -4191,7 +4191,7 @@ class TestBufferOverrun : public TestFixture {
                                    "    <arg nr=\"3\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).severity(Severity::warning).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).severity(Severity::warning).build();
         settings.platform.sizeof_wchar_t = 4;
 
         check("void f() {\n"

test/testclass.cpp

@@ -35,8 +35,10 @@ class TestClass : public TestFixture {
     TestClass() : TestFixture("TestClass") {}
 
 private:
-    Settings settings0 = settingsBuilder().severity(Severity::style).library("std.cfg").build();
+    const Settings settings0 = settingsBuilder().severity(Severity::style).library("std.cfg").build();
     const Settings settings1 = settingsBuilder().severity(Severity::warning).library("std.cfg").build();
+    const Settings settings2 = settingsBuilder().severity(Severity::style).library("std.cfg").certainty(Certainty::inconclusive).build();
+    const Settings settings3 = settingsBuilder().severity(Severity::style).library("std.cfg").severity(Severity::warning).build();
 
     void run() override {
         TEST_CASE(virtualDestructor1);      // Base class not found => no error
@@ -731,15 +733,15 @@ class TestClass : public TestFixture {
         // Clear the error log
         errout.str("");
 
-        Preprocessor preprocessor(settings0);
+        Preprocessor preprocessor(settings3);
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this, &preprocessor);
+        Tokenizer tokenizer(settings3, this, &preprocessor);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClass checkClass(&tokenizer, &settings3, this);
         checkClass.copyconstructors();
     }
 
@@ -2617,19 +2619,17 @@ class TestClass : public TestFixture {
         // Clear the error log
         errout.str("");
 
-        // TODO: subsequent tests depend on these changes - should use SettingsBuilder
-        settings0.certainty.setEnabled(Certainty::inconclusive, inconclusive);
-        settings0.severity.enable(Severity::warning);
+        const Settings s = settingsBuilder(settings0).certainty(Certainty::inconclusive, inconclusive).severity(Severity::warning).build();
 
-        Preprocessor preprocessor(settings0);
+        Preprocessor preprocessor(s);
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this, &preprocessor);
+        Tokenizer tokenizer(s, this, &preprocessor);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
         // Check..
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClass checkClass(&tokenizer, &s, this);
         checkClass.virtualDestructor();
     }
 
@@ -7565,16 +7565,14 @@ class TestClass : public TestFixture {
         errout.str("");
 
         // Check..
-        settings0.certainty.setEnabled(Certainty::inconclusive, true);
-
-        Preprocessor preprocessor(settings0);
+        Preprocessor preprocessor(settings2);
 
         // Tokenize..
-        Tokenizer tokenizer(settings0, this, &preprocessor);
+        Tokenizer tokenizer(settings2, this, &preprocessor);
         std::istringstream istr(code);
         ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
 
-        CheckClass checkClass(&tokenizer, &settings0, this);
+        CheckClass checkClass(&tokenizer, &settings2, this);
         checkClass.initializerListOrder();
     }
 
@@ -8749,7 +8747,7 @@ class TestClass : public TestFixture {
         // Clear the error log
         errout.str("");
 
-        Settings settings = settingsBuilder().severity(Severity::warning).build();
+        /*const*/ Settings settings = settingsBuilder().severity(Severity::warning).build();
         settings.safeChecks.classes = true;
 
         Preprocessor preprocessor(settings);

test/testcondition.cpp

@@ -36,7 +36,7 @@ class TestCondition : public TestFixture {
 
 private:
     const Settings settings0 = settingsBuilder().library("qt.cfg").library("std.cfg").severity(Severity::style).severity(Severity::warning).build();
-    Settings settings1 = settingsBuilder().severity(Severity::style).severity(Severity::warning).build();
+    /*const*/ Settings settings1 = settingsBuilder().severity(Severity::style).severity(Severity::warning).build();
 
     void run() override {
         const char cfg[] = "<?xml version=\"1.0\"?>\n"

test/testexceptionsafety.cpp

@@ -30,7 +30,7 @@ class TestExceptionSafety : public TestFixture {
     TestExceptionSafety() : TestFixture("TestExceptionSafety") {}
 
 private:
-    Settings settings;
+    /*const*/ Settings settings;
 
     void run() override {
         settings.severity.fill();

test/testfunctions.cpp

@@ -1837,7 +1837,7 @@ class TestFunctions : public TestFixture {
     }
 
     void checkLibraryMatchFunctions() {
-        Settings s = settingsBuilder(settings).checkLibrary().debugwarnings().build();
+        /*const*/ Settings s = settingsBuilder(settings).checkLibrary().debugwarnings().build();
         s.daca = true;
 
         check("void f() {\n"

test/testgarbage.cpp

@@ -34,7 +34,7 @@ class TestGarbage : public TestFixture {
     TestGarbage() : TestFixture("TestGarbage") {}
 
 private:
-    Settings settings = settingsBuilder().debugwarnings().build();
+    /*const*/ Settings settings = settingsBuilder().debugwarnings().build();
 
     void run() override {
         settings.severity.fill();

test/testinternal.cpp

@@ -30,7 +30,7 @@ class TestInternal : public TestFixture {
     TestInternal() : TestFixture("TestInternal") {}
 
 private:
-    Settings settings;
+    /*const*/ Settings settings;
 
     void run() override {
         settings.addEnabled("internal");

test/testio.cpp

@@ -35,7 +35,7 @@ class TestIO : public TestFixture {
 
 private:
     const Settings settings = settingsBuilder().library("std.cfg").library("windows.cfg").library("qt.cfg").build();
-    Settings settings1 = settingsBuilder().library("std.cfg").library("windows.cfg").library("qt.cfg").build();
+    /*const*/ Settings settings1 = settingsBuilder().library("std.cfg").library("windows.cfg").library("qt.cfg").build();
 
     void run() override {
         TEST_CASE(coutCerrMisusage);

test/testother.cpp

@@ -35,12 +35,9 @@ class TestOther : public TestFixture {
     TestOther() : TestFixture("TestOther") {}
 
 private:
-    Settings _settings;
+    /*const*/ Settings _settings = settingsBuilder().library("std.cfg").build();
 
     void run() override {
-        LOAD_LIB_2(_settings.library, "std.cfg");
-
-
         TEST_CASE(emptyBrackets);
 
         TEST_CASE(zeroDiv1);
@@ -355,8 +352,7 @@ class TestOther : public TestFixture {
     }
 
     void checkInterlockedDecrement(const char code[]) {
-        Settings settings;
-        settings.platform.type = Platform::Type::Win32A;
+        /*const*/ Settings settings = settingsBuilder().platform(Platform::Type::Win32A).build();
 
         check(code, nullptr, false, true, false, &settings);
     }
@@ -1905,7 +1901,7 @@ class TestOther : public TestFixture {
         // Clear the error buffer..
         errout.str("");
 
-        Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability, portability).certainty(Certainty::inconclusive, inconclusive).build();
+        /*const*/ Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability, portability).certainty(Certainty::inconclusive, inconclusive).build();
         settings.platform.defaultSign = 's';
 
         Preprocessor preprocessor(settings);
@@ -2204,7 +2200,7 @@ class TestOther : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 't' should be passed by const reference.\n", errout.str());
 
-        Settings settings0 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
+        /*const*/ Settings settings0 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
         check("struct S {\n" // #12138
               "    union {\n"
               "        int a = 0;\n"
@@ -2243,7 +2239,7 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:2]: (performance) Function parameter 's' should be passed by const reference.\n",
                       errout.str());
 
-        Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
+        /*const*/ Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
         check("using ui64 = unsigned __int64;\n"
               "ui64 Test(ui64 one, ui64 two) { return one + two; }\n",
               /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings1);
@@ -2390,11 +2386,11 @@ class TestOther : public TestFixture {
                                 "};\n"
                                 "void f(X x) {}";
 
-            Settings s32 = settingsBuilder(_settings).platform(Platform::Type::Unix32).build();
+            /*const*/ Settings s32 = settingsBuilder(_settings).platform(Platform::Type::Unix32).build();
             check(code, &s32);
             ASSERT_EQUALS("[test.cpp:5]: (performance) Function parameter 'x' should be passed by const reference.\n", errout.str());
 
-            Settings s64 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
+            /*const*/ Settings s64 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
             check(code, &s64);
             ASSERT_EQUALS("", errout.str());
         }
@@ -4929,7 +4925,7 @@ class TestOther : public TestFixture {
                                    "    <arg nr=\"1\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
 
         check("void foo() {\n"
               "    exit(0);\n"
@@ -6627,7 +6623,7 @@ class TestOther : public TestFixture {
                                    "    <arg nr=\"2\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
+        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata, sizeof(xmldata)).build();
 
         check("void foo() {\n"
               "    if (x() || x()) {}\n"
@@ -7268,7 +7264,7 @@ class TestOther : public TestFixture {
             const char code[] = "void foo(bool flag) {\n"
                                 "  bar( (flag) ? ~0u : ~0ul);\n"
                                 "}";
-            Settings settings = _settings;
+            /*const*/ Settings settings = _settings;
             settings.platform.sizeof_int = 4;
             settings.platform.int_bit = 32;
 
@@ -8217,10 +8213,9 @@ class TestOther : public TestFixture {
         }
 
         {
-            Settings s = settingsBuilder().checkUnusedTemplates().build();
             check("template<int n> void foo(unsigned int x) {\n"
                   "if (x <= 0);\n"
-                  "}", &s);
+                  "}");
             ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned expression 'x' is less than zero.\n", errout.str());
         }
 
@@ -8235,7 +8230,7 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:3]: (style) Checking if unsigned expression 'value' is less than zero.\n", errout.str());
 
         // #9040
-        Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
+        /*const*/ Settings settings1 = settingsBuilder().platform(Platform::Type::Win64).build();
         check("using BOOL = unsigned;\n"
               "int i;\n"
               "bool f() {\n"
@@ -11123,13 +11118,11 @@ class TestOther : public TestFixture {
     }
 
     void forwardAndUsed() {
-        Settings s = settingsBuilder().checkUnusedTemplates().build();
-
         check("template<typename T>\n"
               "void f(T && t) {\n"
               "    g(std::forward<T>(t));\n"
               "    T s = t;\n"
-              "}", &s);
+              "}");
         ASSERT_EQUALS("[test.cpp:4]: (warning) Access of forwarded variable 't'.\n", errout.str());
     }