testrunner: some settings cleanups

Author: firewave

test/testbufferoverrun.cpp

@@ -36,6 +36,8 @@ class TestBufferOverrun : public TestFixture {
 
 private:
     /*const*/ Settings settings0 = settingsBuilder().library("std.cfg").severity(Severity::warning).severity(Severity::style).severity(Severity::portability).build();
+    const Settings settings0_i = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+    const Settings settings1 = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
 
     struct CheckOptions
     {
@@ -46,7 +48,7 @@ class TestBufferOverrun : public TestFixture {
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings = options.s ? *options.s : settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
+        const Settings& settings = options.s ? *options.s : settings0_i;
 
         // Tokenize..
         SimpleTokenizer tokenizer(settings, *this, options.cpp);
@@ -58,10 +60,8 @@ class TestBufferOverrun : public TestFixture {
 
     // TODO: get rid of this
     void check_(const char* file, int line, const std::string& code) {
-        const Settings settings = settingsBuilder(settings0).certainty(Certainty::inconclusive).build();
-
         // Tokenize..
-        SimpleTokenizer tokenizer(settings, *this);
+        SimpleTokenizer tokenizer(settings0_i, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for buffer overruns..
@@ -72,9 +72,7 @@ class TestBufferOverrun : public TestFixture {
     template<size_t size>
     void checkP_(const char* file, int line, const char (&code)[size])
     {
-        const Settings settings = settingsBuilder(settings0).severity(Severity::performance).certainty(Certainty::inconclusive).build();
-
-        SimpleTokenizer2 tokenizer(settings, *this, code, "test.cpp");
+        SimpleTokenizer2 tokenizer(settings1, *this, code, "test.cpp");
 
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
@@ -2722,7 +2720,7 @@ class TestBufferOverrun : public TestFixture {
               "    char str[6] = \"\\0\";\n"
               "    unsigned short port = 65535;\n"
               "    snprintf(str, sizeof(str), \"%hu\", port);\n"
-              "}", dinit(CheckOptions, $.s = &settings0, $.cpp = false));
+              "}", dinit(CheckOptions, $.cpp = false));
         ASSERT_EQUALS("", errout_str());
 
         check("int f(int x) {\n" // #11020

test/testclass.cpp

@@ -7626,10 +7626,10 @@ class TestClass : public TestFixture {
                             "    }\n"
                             "};";
 
-        checkConst(code, dinit(CheckConstOptions, $.s = &settings0, $.inconclusive = true));
+        checkConst(code);
         ASSERT_EQUALS("[test.cpp:3:10]: (performance, inconclusive) Technically the member function 'foo::f' can be static (but you may consider moving to unnamed namespace). [functionStatic]\n", errout_str());
 
-        checkConst(code, dinit(CheckConstOptions, $.s = &settings0, $.inconclusive = false)); // TODO: Set inconclusive to true (preprocess it)
+        checkConst(code, dinit(CheckConstOptions, $.inconclusive = false)); // TODO: Set inconclusive to true (preprocess it)
         ASSERT_EQUALS("", errout_str());
     }
 

test/testleakautovar.cpp

@@ -29,7 +29,7 @@ class TestLeakAutoVar : public TestFixture {
     TestLeakAutoVar() : TestFixture("TestLeakAutoVar") {}
 
 private:
-    const Settings settings = settingsBuilder().library("std.cfg").build();
+    const Settings settings = settingsBuilder().library("std.cfg").checkLibrary().build();
 
     void run() override {
         mNewTemplate = true;
@@ -223,7 +223,7 @@ class TestLeakAutoVar : public TestFixture {
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
-        const Settings settings1 = settingsBuilder(options.s ? *options.s : settings).checkLibrary().build();
+        const Settings& settings1 = options.s ? *options.s : settings;
 
         // Tokenize..
         SimpleTokenizer tokenizer(settings1, *this, options.cpp);
@@ -235,10 +235,8 @@ class TestLeakAutoVar : public TestFixture {
 
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const Settings & s) {
-        const Settings settings0 = settingsBuilder(s).checkLibrary().build();
-
         // Tokenize..
-        SimpleTokenizer tokenizer(settings0, *this);
+        SimpleTokenizer tokenizer(s, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
         // Check for leaks..
@@ -454,7 +452,7 @@ class TestLeakAutoVar : public TestFixture {
     }
 
     void assign22() { // #9139
-        const Settings s = settingsBuilder().library("posix.cfg").build();
+        const Settings s = settingsBuilder().library("posix.cfg").checkLibrary().build();
         check("void f(char tempFileName[256]) {\n"
               "    const int fd = socket(AF_INET, SOCK_PACKET, 0 );\n"
               "}", dinit(CheckOptions, $.cpp = true, $.s = &s));
@@ -467,7 +465,7 @@ class TestLeakAutoVar : public TestFixture {
     }
 
     void assign23() {
-        const Settings s = settingsBuilder().library("posix.cfg").build();
+        const Settings s = settingsBuilder().library("posix.cfg").checkLibrary().build();
         check("void f() {\n"
               "    int n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14;\n"
               "    *&n1 = open(\"xx.log\", O_RDONLY);\n"
@@ -2277,7 +2275,7 @@ class TestLeakAutoVar : public TestFixture {
     }
 
     void ifelse24() { // #1733
-        const Settings s = settingsBuilder().library("std.cfg").library("posix.cfg").build();
+        const Settings s = settingsBuilder().library("std.cfg").library("posix.cfg").checkLibrary().build();
 
         check("void f() {\n"
               "    char* temp = strdup(\"temp.txt\");\n"
@@ -3190,7 +3188,7 @@ class TestLeakAutoVar : public TestFixture {
                                    "    <arg nr=\"1\" direction=\"in\"/>\n"
                                    "  </function>\n"
                                    "</def>\n";
-        const Settings settingsLeakIgnore = settingsBuilder().libraryxml(xmldata).build();
+        const Settings settingsLeakIgnore = settingsBuilder().libraryxml(xmldata).checkLibrary().build();
         check("void f() {\n"
               "    double* a = new double[1024];\n"
               "    SomeClass::someMethod(a);\n"

test/testvalueflow.cpp

@@ -5641,7 +5641,7 @@ class TestValueFlow : public TestFixture {
 
         // #13959
         const Settings settingsOld = settings;
-        settings = settingsBuilder(settingsOld).c(Standards::C23).build();
+        settings.standards.c = Standards::C23;
         code = "void f(int* p) {\n"
                "    if (p == nullptr)\n"
                "        return;\n"
@@ -5651,7 +5651,7 @@ class TestValueFlow : public TestFixture {
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT_EQUALS(true, value.isKnown());
 
-        settings = settingsBuilder(settingsOld).c(Standards::C17).build();
+        settings.standards.c = Standards::C17;
         value = valueOfTok(code, "p ) { }", &settings, /*cpp*/ false);
         ASSERT(value == ValueFlow::Value());
         settings = settingsOld;