Skip to content

Commit 0a2b584

Browse files
firewavefirewave
committed
testrunner: create more settings as immutable
1 parent 69a2d17 commit 0a2b584

File tree

3 files changed

+83
-68
lines changed

3 files changed

+83
-68
lines changed

‎test/testbufferoverrun.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4283,8 +4283,9 @@ class TestBufferOverrun : public TestFixture {
42834283
" <arg nr=\"3\"/>\n"
42844284
" </function>\n"
42854285
"</def>";
4286-
/*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::warning).build();
4287-
settings.platform.sizeof_wchar_t = 4;
4286+
// use a platform which has wchar_t with a sizeof 4
4287+
const Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::warning).platform(Platform::Unix32).build();
4288+
ASSERT_EQUALS(4, settings.platform.sizeof_wchar_t);
42884289

42894290
check("void f() {\n"
42904291
" char c[10];\n"

‎test/testpreprocessor.cpp‎

Lines changed: 74 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,9 +1989,9 @@ class TestPreprocessor : public TestFixture {
19891989
}
19901990

19911991
void inline_suppressions() {
1992-
/*const*/ Settings settings;
1993-
settings.inlineSuppressions = true;
1994-
settings.checks.enable(Checks::missingInclude);
1992+
const auto settings = dinit(Settings,
1993+
$.inlineSuppressions = true,
1994+
$.checks.enable (Checks::missingInclude));
19951995

19961996
const char code[] = "// cppcheck-suppress missingInclude\n"
19971997
"#include \"missing.h\"\n"
@@ -2430,10 +2430,11 @@ class TestPreprocessor : public TestFixture {
24302430

24312431
// test for existing local include
24322432
void testMissingInclude() {
2433-
/*const*/ Settings settings;
2434-
settings.clearIncludeCache = true;
2435-
settings.checks.enable(Checks::missingInclude);
2436-
settings.templateFormat = "simple"; // has no effect
2433+
const auto settings = dinit(Settings,
2434+
$.clearIncludeCache = true,
2435+
$.checks.enable (Checks::missingInclude),
2436+
$.templateFormat = "simple" // has no effect
2437+
);
24372438
setTemplateFormat("simple");
24382439

24392440
ScopedFile header("header.h", "");
@@ -2446,10 +2447,11 @@ class TestPreprocessor : public TestFixture {
24462447

24472448
// test for missing local include
24482449
void testMissingInclude2() {
2449-
/*const*/ Settings settings;
2450-
settings.clearIncludeCache = true;
2451-
settings.checks.enable(Checks::missingInclude);
2452-
settings.templateFormat = "simple"; // has no effect
2450+
const auto settings = dinit(Settings,
2451+
$.clearIncludeCache = true,
2452+
$.checks.enable (Checks::missingInclude),
2453+
$.templateFormat = "simple" // has no effect
2454+
);
24532455
setTemplateFormat("simple");
24542456

24552457
const char code[] = "#include \"header.h\"";
@@ -2460,10 +2462,11 @@ class TestPreprocessor : public TestFixture {
24602462

24612463
// test for missing local include - no include path given
24622464
void testMissingInclude3() {
2463-
/*const*/ Settings settings;
2464-
settings.clearIncludeCache = true;
2465-
settings.checks.enable(Checks::missingInclude);
2466-
settings.templateFormat = "simple"; // has no effect
2465+
const auto settings = dinit(Settings,
2466+
$.clearIncludeCache = true,
2467+
$.checks.enable (Checks::missingInclude),
2468+
$.templateFormat = "simple" // has no effect
2469+
);
24672470
setTemplateFormat("simple");
24682471

24692472
ScopedFile header("header.h", "", "inc");
@@ -2476,11 +2479,12 @@ class TestPreprocessor : public TestFixture {
24762479

24772480
// test for existing local include - include path provided
24782481
void testMissingInclude4() {
2479-
/*const*/ Settings settings;
2480-
settings.clearIncludeCache = true;
2481-
settings.checks.enable(Checks::missingInclude);
2482-
settings.includePaths.emplace_back("inc");
2483-
settings.templateFormat = "simple"; // has no effect
2482+
const auto settings = dinit(Settings,
2483+
$.clearIncludeCache = true,
2484+
$.checks.enable (Checks::missingInclude),
2485+
$.includePaths.emplace_back ("inc"),
2486+
$.templateFormat = "simple" // has no effect
2487+
);
24842488
setTemplateFormat("simple");
24852489

24862490
ScopedFile header("header.h", "", "inc");
@@ -2493,11 +2497,12 @@ class TestPreprocessor : public TestFixture {
24932497

24942498
// test for existing local include - absolute path
24952499
void testMissingInclude5() {
2496-
/*const*/ Settings settings;
2497-
settings.clearIncludeCache = true;
2498-
settings.checks.enable(Checks::missingInclude);
2499-
settings.includePaths.emplace_back("inc");
2500-
settings.templateFormat = "simple"; // has no effect
2500+
const auto settings = dinit(Settings,
2501+
$.clearIncludeCache = true,
2502+
$.checks.enable (Checks::missingInclude),
2503+
$.includePaths.emplace_back ("inc"),
2504+
$.templateFormat = "simple" // has no effect
2505+
);
25012506
setTemplateFormat("simple");
25022507

25032508
ScopedFile header("header.h", "", Path::getCurrentPath());
@@ -2510,10 +2515,11 @@ class TestPreprocessor : public TestFixture {
25102515

25112516
// test for missing local include - absolute path
25122517
void testMissingInclude6() {
2513-
/*const*/ Settings settings;
2514-
settings.clearIncludeCache = true;
2515-
settings.checks.enable(Checks::missingInclude);
2516-
settings.templateFormat = "simple"; // has no effect
2518+
const auto settings = dinit(Settings,
2519+
$.clearIncludeCache = true,
2520+
$.checks.enable (Checks::missingInclude),
2521+
$.templateFormat = "simple" // has no effect
2522+
);
25172523
setTemplateFormat("simple");
25182524

25192525
const std::string header = Path::join(Path::getCurrentPath(), "header.h");
@@ -2526,10 +2532,11 @@ class TestPreprocessor : public TestFixture {
25262532

25272533
// test for missing system include - system includes are not searched for in relative path
25282534
void testMissingSystemInclude() {
2529-
/*const*/ Settings settings;
2530-
settings.clearIncludeCache = true;
2531-
settings.checks.enable(Checks::missingInclude);
2532-
settings.templateFormat = "simple"; // has no effect
2535+
const auto settings = dinit(Settings,
2536+
$.clearIncludeCache = true,
2537+
$.checks.enable (Checks::missingInclude),
2538+
$.templateFormat = "simple" // has no effect
2539+
);
25332540
setTemplateFormat("simple");
25342541

25352542
ScopedFile header("header.h", "");
@@ -2542,10 +2549,11 @@ class TestPreprocessor : public TestFixture {
25422549

25432550
// test for missing system include
25442551
void testMissingSystemInclude2() {
2545-
/*const*/ Settings settings;
2546-
settings.clearIncludeCache = true;
2547-
settings.checks.enable(Checks::missingInclude);
2548-
settings.templateFormat = "simple"; // has no effect
2552+
const auto settings = dinit(Settings,
2553+
$.clearIncludeCache = true,
2554+
$.checks.enable (Checks::missingInclude),
2555+
$.templateFormat = "simple" // has no effect
2556+
);
25492557
setTemplateFormat("simple");
25502558

25512559
const char code[] = "#include <header.h>";
@@ -2556,12 +2564,13 @@ class TestPreprocessor : public TestFixture {
25562564

25572565
// test for existing system include in system include path
25582566
void testMissingSystemInclude3() {
2559-
/*const*/ Settings settings;
2560-
settings.clearIncludeCache = true;
2561-
settings.checks.enable(Checks::missingInclude);
2562-
settings.templateFormat = "simple"; // has no effect
2567+
const auto settings = dinit(Settings,
2568+
$.clearIncludeCache = true,
2569+
$.checks.enable (Checks::missingInclude),
2570+
$.templateFormat = "simple", // has no effect
2571+
$.includePaths.emplace_back ("system")
2572+
);
25632573
setTemplateFormat("simple");
2564-
settings.includePaths.emplace_back("system");
25652574

25662575
ScopedFile header("header.h", "", "system");
25672576

@@ -2573,11 +2582,12 @@ class TestPreprocessor : public TestFixture {
25732582

25742583
// test for existing system include - absolute path
25752584
void testMissingSystemInclude4() {
2576-
/*const*/ Settings settings;
2577-
settings.clearIncludeCache = true;
2578-
settings.checks.enable(Checks::missingInclude);
2579-
settings.includePaths.emplace_back("inc");
2580-
settings.templateFormat = "simple"; // has no effect
2585+
const auto settings = dinit(Settings,
2586+
$.clearIncludeCache = true,
2587+
$.checks.enable (Checks::missingInclude),
2588+
$.includePaths.emplace_back ("inc");
2589+
$.templateFormat = "simple" // has no effect
2590+
);
25812591
setTemplateFormat("simple");
25822592

25832593
ScopedFile header("header.h", "", Path::getCurrentPath());
@@ -2590,10 +2600,11 @@ class TestPreprocessor : public TestFixture {
25902600

25912601
// test for missing system include - absolute path
25922602
void testMissingSystemInclude5() {
2593-
/*const*/ Settings settings;
2594-
settings.clearIncludeCache = true;
2595-
settings.checks.enable(Checks::missingInclude);
2596-
settings.templateFormat = "simple"; // has no effect
2603+
const auto settings = dinit(Settings,
2604+
$.clearIncludeCache = true,
2605+
$.checks.enable (Checks::missingInclude),
2606+
$.templateFormat = "simple" // has no effect
2607+
);
25972608
setTemplateFormat("simple");
25982609

25992610
const std::string header = Path::join(Path::getCurrentPath(), "header.h");
@@ -2606,10 +2617,12 @@ class TestPreprocessor : public TestFixture {
26062617

26072618
// test for missing local and system include
26082619
void testMissingIncludeMixed() {
2609-
/*const*/ Settings settings;
2610-
settings.clearIncludeCache = true;
2611-
settings.checks.enable(Checks::missingInclude);
2612-
settings.templateFormat = "simple"; // has no effect
2620+
const auto settings = dinit(Settings,
2621+
$.clearIncludeCache = true,
2622+
$.checks.enable (Checks::missingInclude),
2623+
2624+
$.templateFormat = "simple" // has no effect
2625+
);
26132626
setTemplateFormat("simple");
26142627

26152628
ScopedFile header("header.h", "");
@@ -2627,11 +2640,12 @@ class TestPreprocessor : public TestFixture {
26272640
}
26282641

26292642
void testMissingIncludeCheckConfig() {
2630-
/*const*/ Settings settings;
2631-
settings.clearIncludeCache = true;
2632-
settings.checks.enable(Checks::missingInclude);
2633-
settings.includePaths.emplace_back("system");
2634-
settings.templateFormat = "simple"; // has no effect
2643+
const auto settings = dinit(Settings,
2644+
$.clearIncludeCache = true,
2645+
$.checks.enable (Checks::missingInclude),
2646+
$.includePaths.emplace_back ("system");
2647+
$.templateFormat = "simple" // has no effect
2648+
);
26352649
setTemplateFormat("simple");
26362650

26372651
ScopedFile header("header.h", "");

‎test/testsuppressions.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -314,12 +314,12 @@ class TestSuppressions : public TestFixture {
314314
fileSettings.emplace_back("test.cpp", Standards::Language::CPP, strlen(code));
315315
}
316316

317-
/*const*/ auto settings = dinit(Settings,
318-
$.jobs = 2,
319-
$.quiet = true,
320-
$.inlineSuppressions = true);
321-
settings.severity.enable(Severity::information);
322-
settings.templateFormat = templateFormat;
317+
const auto settings = dinit(Settings,
318+
$.jobs = 2,
319+
$.quiet = true,
320+
$.inlineSuppressions = true,
321+
$.severity.enable (Severity::information),
322+
$.templateFormat = templateFormat);
323323

324324
Suppressions supprs;
325325
if (!suppression.empty()) {

0 commit comments

Comments
 (0)