testrunner: do not use global check instances

firewave · firewave · commit e86d85ddedec · 2026-05-16T17:55:37.000+02:00
diff --git a/Makefile b/Makefile
diff --git a/test/fixture.h b/test/fixture.h
@@ -21,7 +21,6 @@
 #define fixtureH
 
 #include "check.h"
-#include "checks.h"
 #include "color.h"
 #include "config.h"
 #include "errorlogger.h"
@@ -33,7 +32,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <exception>
-#include <list>
 #include <memory>
 #include <set>
 #include <sstream>
@@ -136,21 +134,13 @@ class TestFixture : public ErrorLogger {
 
     void processOptions(const options& args);
 
-    template<typename T>
-    static T& getCheck()
+    static Check& getCheck(Check& check)
     {
-        for (Check *check : CheckInstances::get()) {
-            //cppcheck-suppress useStlAlgorithm
-            if (T* c = dynamic_cast<T*>(check))
-                return *c;
-        }
-        throw std::runtime_error("instance not found");
+        return check;
     }
 
-    template<typename T>
-    static void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
+    static void runChecks(Check& check, const Tokenizer &tokenizer, ErrorLogger *errorLogger)
     {
-        Check& check = getCheck<T>();
         check.runChecks(tokenizer, errorLogger);
     }
 
diff --git a/test/testassert.cpp b/test/testassert.cpp
@@ -39,8 +39,8 @@ class TestAssert : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckAssert>(tokenizer, this);
+        CheckAssert check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
@@ -47,7 +47,8 @@ class TestAutoVariables : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this, options.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckAutoVariables>(tokenizer, this);
+        CheckAutoVariables check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
diff --git a/test/testbool.cpp b/test/testbool.cpp
@@ -88,8 +88,8 @@ class TestBool : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, options.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check...
-        runChecks<CheckBool>(tokenizer, this);
+        CheckBool check;
+        runChecks(check, tokenizer, this);
     }
 
 
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
@@ -56,8 +56,8 @@ class TestBufferOverrun : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, this);
     }
 
     // TODO: get rid of this
@@ -66,8 +66,8 @@ class TestBufferOverrun : public TestFixture {
         SimpleTokenizer tokenizer(settings0_i, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -79,8 +79,8 @@ class TestBufferOverrun : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for buffer overruns..
-        runChecks<CheckBufferOverrun>(tokenizer, this);
+        CheckBufferOverrun check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
@@ -5169,7 +5169,8 @@ class TestBufferOverrun : public TestFixture {
 
     void getErrorMessages() {
         // Ticket #2292: segmentation fault when using --errorlist
-        const Check& c = getCheck<CheckBufferOverrun>();
+        CheckBufferOverrun check;
+        const Check& c = getCheck(check);
         c.getErrorMessages(this, nullptr);
         // we are not interested in the output - just consume it
         ignore_errout();
@@ -5362,9 +5363,9 @@ class TestBufferOverrun : public TestFixture {
 
         CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
         std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckBufferOverrun>();
+        CheckBufferOverrun check;
+        Check& c = getCheck(check);
         fileInfo.push_back(c.getFileInfo(tokenizer, settings0, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings0, *this); // TODO: check result
         while (!fileInfo.empty()) {
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -9278,7 +9278,8 @@ class TestClass : public TestFixture {
 
 
     void ctu(const std::vector<std::string> &code) {
-        Check &check = getCheck<CheckClass>();
+        CheckClass checkClass;
+        Check &check = getCheck(checkClass);
 
         // getFileInfo
         std::list<Check::FileInfo*> fileInfo;
@@ -9330,8 +9331,8 @@ class TestClass : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        const Check& c = getCheck<CheckClass>();
+        CheckClass check;
+        const Check& c = getCheck(check);
         Check::FileInfo * fileInfo = (c.getFileInfo)(tokenizer, settings1, "");
 
         delete fileInfo;
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -149,8 +149,8 @@ class TestCondition : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Run checks..
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -162,8 +162,8 @@ class TestCondition : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Run checks..
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, this);
     }
 
     void assignAndCompare() {
@@ -527,7 +527,8 @@ class TestCondition : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckCondition>(tokenizer, this);
+        CheckCondition check;
+        runChecks(check, tokenizer, this);
     }
 
     void multicompare() {
diff --git a/test/testexceptionsafety.cpp b/test/testexceptionsafety.cpp
@@ -75,8 +75,8 @@ class TestExceptionSafety : public TestFixture {
         SimpleTokenizer tokenizer(settings1, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check char variable usage..
-        runChecks<CheckExceptionSafety>(tokenizer, this);
+        CheckExceptionSafety check;
+        runChecks(check, tokenizer, this);
     }
 
     void destructors() {
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
@@ -132,7 +132,8 @@ class TestFunctions : public TestFixture {
         SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        runChecks<CheckFunctions>(tokenizer, this);
+        CheckFunctions check;
+        runChecks(check, tokenizer, this);
     }
 
     void prohibitedFunctions_posix() {
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
@@ -56,8 +56,8 @@ class TestInternal : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckInternal>(tokenizer, this);
+        CheckInternal check;
+        runChecks(check, tokenizer, this);
     }
 
     void simplePatternInTokenMatch() {
diff --git a/test/testio.cpp b/test/testio.cpp
@@ -113,7 +113,8 @@ class TestIO : public TestFixture {
             checkIO.checkWrongPrintfScanfArguments();
             return;
         }
-        runChecks<CheckIO>(tokenizer, this);
+        CheckIO check;
+        runChecks(check, tokenizer, this);
     }
 
     void coutCerrMisusage() {
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -226,23 +226,17 @@ class TestLeakAutoVar : public TestFixture {
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
         const Settings& settings1 = options.s ? *options.s : settings;
-
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
-
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        check_(file, line, code, settings1, options.cpp);
     }
 
     template<size_t size>
-    void check_(const char* file, int line, const char (&code)[size], const Settings & s) {
+    void check_(const char* file, int line, const char (&code)[size], const Settings & s, bool cpp = true) {
         // Tokenize..
-        SimpleTokenizer tokenizer(s, *this);
+        SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, this);
     }
 
     void assign1() {
@@ -3272,8 +3266,8 @@ class TestLeakAutoVarRecursiveCountLimit : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
@@ -3319,8 +3313,8 @@ class TestLeakAutoVarStrcpy : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
@@ -3424,8 +3418,8 @@ class TestLeakAutoVarWindows : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, false);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
@@ -3497,8 +3491,8 @@ class TestLeakAutoVarPosix : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for leaks..
-        runChecks<CheckLeakAutoVar>(tokenizer, this);
+        CheckLeakAutoVar check;
+        runChecks(check, tokenizer, this);
     }
 
     void run() override {
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -190,23 +190,17 @@ class TestNullPointer : public TestFixture {
     template<size_t size>
     void check_(const char* file, int line, const char (&code)[size], const CheckOptions& options = make_default_obj()) {
         const Settings& settings1 = options.inconclusive ? settings_i : settings;
-
-        // Tokenize..
-        SimpleTokenizer tokenizer(settings1, *this, options.cpp);
-        ASSERT_LOC(tokenizer.tokenize(code), file, line);
-
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        check_(file, line, code, settings1, options.cpp);
     }
 
     template<size_t size>
-    void check_(const char* file, int line, const char (&code)[size], bool cpp, const Settings& s) {
+    void check_(const char* file, int line, const char (&code)[size], const Settings& s, bool cpp = true) {
         // Tokenize..
         SimpleTokenizer tokenizer(s, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        CheckNullPointer check;
+        runChecks(check, tokenizer, this);
     }
 
 #define checkP(...) checkP_(__FILE__, __LINE__, __VA_ARGS__)
@@ -217,8 +211,8 @@ class TestNullPointer : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check for null pointer dereferences..
-        runChecks<CheckNullPointer>(tokenizer, this);
+        CheckNullPointer check;
+        runChecks(check, tokenizer, this);
     }
 
 
@@ -1349,7 +1343,7 @@ class TestNullPointer : public TestFixture {
         ASSERT_EQUALS("[test.cpp:4:11]: (error) Null pointer dereference: i [nullPointer]\n", errout_str());
 
         const Settings s = settingsBuilder(settings).c(Standards::C17).build();
-        check(code, false, s); // C17 file => nullptr does not mean NULL
+        check(code, s, false); // C17 file => nullptr does not mean NULL
         ASSERT_EQUALS("", errout_str());
 
         check(code, dinit(CheckOptions, $.cpp = false));
@@ -4698,9 +4692,9 @@ class TestNullPointer : public TestFixture {
 
         CTU::FileInfo *ctu = CTU::getFileInfo(tokenizer);
 
-        // Check code..
+        CheckNullPointer check;
+        Check& c = getCheck(check);
         std::list<Check::FileInfo*> fileInfo;
-        Check& c = getCheck<CheckNullPointer>();
         fileInfo.push_back(c.getFileInfo(tokenizer, settings, ""));
         c.analyseWholeProgram(*ctu, fileInfo, settings, *this); // TODO: check result
         while (!fileInfo.empty()) {
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -367,8 +367,8 @@ class TestOther : public TestFixture {
         SimpleTokenizer tokenizer(*settings, *this, opt.cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, this);
     }
 
     struct CheckPOptions
@@ -384,8 +384,8 @@ class TestOther : public TestFixture {
         // Tokenizer..
         ASSERT_LOC(tokenizer.simplifyTokens1(""), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, this);
     }
 
     template<size_t size>
@@ -12314,8 +12314,8 @@ class TestOther : public TestFixture {
         SimpleTokenizer tokenizer(settings, *this, cpp);
         ASSERT_LOC(tokenizer.tokenize(code), file, line);
 
-        // Check..
-        runChecks<CheckOther>(tokenizer, this);
+        CheckOther check;
+        runChecks(check, tokenizer, this);
     }
 
     void testEvaluationOrder() {
diff --git a/test/testsizeof.cpp b/test/testsizeof.cpp
diff --git a/test/teststl.cpp b/test/teststl.cpp
diff --git a/test/teststring.cpp b/test/teststring.cpp
diff --git a/test/testtype.cpp b/test/testtype.cpp
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
diff --git a/test/testvaarg.cpp b/test/testvaarg.cpp

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ class TestAssert : public TestFixture {`
`39`	`39`	`SimpleTokenizer tokenizer(settings, *this);`
`40`	`40`	`ASSERT_LOC(tokenizer.tokenize(code), file, line);`
`41`	`41`
`42`		`- // Check..`
`43`		`- runChecks<CheckAssert>(tokenizer, this);`
	`42`	`+ CheckAssert check;`
	`43`	`+ runChecks(check, tokenizer, this);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void run() override {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ class TestAutoVariables : public TestFixture {`
`47`	`47`	`SimpleTokenizer tokenizer(settings1, *this, options.cpp);`
`48`	`48`	`ASSERT_LOC(tokenizer.tokenize(code), file, line);`
`49`	`49`
`50`		`- runChecks<CheckAutoVariables>(tokenizer, this);`
	`50`	`+ CheckAutoVariables check;`
	`51`	`+ runChecks(check, tokenizer, this);`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`void run() override {`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ class TestBool : public TestFixture {`
`88`	`88`	`SimpleTokenizer tokenizer(settings, *this, options.cpp);`
`89`	`89`	`ASSERT_LOC(tokenizer.tokenize(code), file, line);`
`90`	`90`
`91`		`- // Check...`
`92`		`- runChecks<CheckBool>(tokenizer, this);`
	`91`	`+ CheckBool check;`
	`92`	`+ runChecks(check, tokenizer, this);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ class TestExceptionSafety : public TestFixture {`
`75`	`75`	`SimpleTokenizer tokenizer(settings1, *this);`
`76`	`76`	`ASSERT_LOC(tokenizer.tokenize(code), file, line);`
`77`	`77`
`78`		`- // Check char variable usage..`
`79`		`- runChecks<CheckExceptionSafety>(tokenizer, this);`
	`78`	`+ CheckExceptionSafety check;`
	`79`	`+ runChecks(check, tokenizer, this);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`void destructors() {`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@ class TestFunctions : public TestFixture {`
`132`	`132`	`SimpleTokenizer tokenizer(s, *this, cpp);`
`133`	`133`	`ASSERT_LOC(tokenizer.tokenize(code), file, line);`
`134`	`134`
`135`		`- runChecks<CheckFunctions>(tokenizer, this);`
	`135`	`+ CheckFunctions check;`
	`136`	`+ runChecks(check, tokenizer, this);`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`void prohibitedFunctions_posix() {`