Skip to content

Commit bb30d61

Browse files
firewavefirewave
committed
made some local const Settings objects in test static 
1 parent c1d2df9 commit bb30d61

11 files changed

Lines changed: 27 additions & 27 deletions

‎test/testastutils.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TestAstUtils : public TestFixture {
4949

5050
#define findLambdaEndToken(code) findLambdaEndToken_(code, __FILE__, __LINE__)
5151
bool findLambdaEndToken_(const char code[], const char* file, int line) {
52-
const Settings settings;
52+
static const Settings settings;
5353
Tokenizer tokenizer(&settings, this);
5454
std::istringstream istr(code);
5555
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -83,7 +83,7 @@ class TestAstUtils : public TestFixture {
8383

8484
#define findLambdaStartToken(code) findLambdaStartToken_(code, __FILE__, __LINE__)
8585
bool findLambdaStartToken_(const char code[], const char* file, int line) {
86-
const Settings settings;
86+
static const Settings settings;
8787
Tokenizer tokenizer(&settings, this);
8888
std::istringstream istr(code);
8989
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -116,7 +116,7 @@ class TestAstUtils : public TestFixture {
116116

117117
#define isNullOperand(code) isNullOperand_(code, __FILE__, __LINE__)
118118
bool isNullOperand_(const char code[], const char* file, int line) {
119-
const Settings settings;
119+
static const Settings settings;
120120
Tokenizer tokenizer(&settings, this);
121121
std::istringstream istr(code);
122122
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -138,7 +138,7 @@ class TestAstUtils : public TestFixture {
138138

139139
#define isReturnScope(code, offset) isReturnScope_(code, offset, __FILE__, __LINE__)
140140
bool isReturnScope_(const char code[], int offset, const char* file, int line) {
141-
const Settings settings;
141+
static const Settings settings;
142142
Tokenizer tokenizer(&settings, this);
143143
std::istringstream istr(code);
144144
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -169,7 +169,7 @@ class TestAstUtils : public TestFixture {
169169

170170
#define isSameExpression(code, tokStr1, tokStr2) isSameExpression_(code, tokStr1, tokStr2, __FILE__, __LINE__)
171171
bool isSameExpression_(const char code[], const char tokStr1[], const char tokStr2[], const char* file, int line) {
172-
const Settings settings;
172+
static const Settings settings;
173173
Library library;
174174
Tokenizer tokenizer(&settings, this);
175175
std::istringstream istr(code);
@@ -209,7 +209,7 @@ class TestAstUtils : public TestFixture {
209209

210210
#define isVariableChanged(code, startPattern, endPattern) isVariableChanged_(code, startPattern, endPattern, __FILE__, __LINE__)
211211
bool isVariableChanged_(const char code[], const char startPattern[], const char endPattern[], const char* file, int line) {
212-
const Settings settings;
212+
static const Settings settings;
213213
Tokenizer tokenizer(&settings, this);
214214
std::istringstream istr(code);
215215
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -239,7 +239,7 @@ class TestAstUtils : public TestFixture {
239239

240240
#define isVariableChangedByFunctionCall(code, pattern, inconclusive) isVariableChangedByFunctionCall_(code, pattern, inconclusive, __FILE__, __LINE__)
241241
bool isVariableChangedByFunctionCall_(const char code[], const char pattern[], bool *inconclusive, const char* file, int line) {
242-
const Settings settings;
242+
static const Settings settings;
243243
Tokenizer tokenizer(&settings, this);
244244
std::istringstream istr(code);
245245
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -415,7 +415,7 @@ class TestAstUtils : public TestFixture {
415415

416416
#define nextAfterAstRightmostLeaf(code, parentPattern, rightPattern) nextAfterAstRightmostLeaf_(code, parentPattern, rightPattern, __FILE__, __LINE__)
417417
bool nextAfterAstRightmostLeaf_(const char code[], const char parentPattern[], const char rightPattern[], const char* file, int line) {
418-
const Settings settings;
418+
static const Settings settings;
419419
Tokenizer tokenizer(&settings, this);
420420
std::istringstream istr(code);
421421
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -440,7 +440,7 @@ class TestAstUtils : public TestFixture {
440440
enum class Result {False, True, Fail};
441441

442442
Result isUsedAsBool(const char code[], const char pattern[]) {
443-
const Settings settings;
443+
static const Settings settings;
444444
Tokenizer tokenizer(&settings, this);
445445
std::istringstream istr(code);
446446
if (!tokenizer.tokenize(istr, "test.cpp"))

‎test/testbufferoverrun.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5493,7 +5493,7 @@ class TestBufferOverrun : public TestFixture {
54935493

54945494
void checkPipeParameterSize() { // #3521
54955495

5496-
const Settings settings = settingsBuilder().library("posix.cfg").build();
5496+
static const Settings settings = settingsBuilder().library("posix.cfg").build();
54975497

54985498
check("void f(){\n"
54995499
"int pipefd[1];\n" // <-- array of two integers is needed

‎test/testclangimport.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class TestClangImport : public TestFixture {
137137
}
138138

139139
std::string parse(const char clang[]) {
140-
const Settings settings = settingsBuilder().clang().build();
140+
static const Settings settings = settingsBuilder().clang().build();
141141
Tokenizer tokenizer(&settings, this);
142142
std::istringstream istr(clang);
143143
clangimport::parseClangAstDump(&tokenizer, istr);

‎test/testclass.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class TestClass : public TestFixture {
259259
void checkCopyCtorAndEqOperator_(const char code[], const char* file, int line) {
260260
// Clear the error log
261261
errout.str("");
262-
const Settings settings = settingsBuilder().severity(Severity::warning).build();
262+
static const Settings settings = settingsBuilder().severity(Severity::warning).build();
263263

264264
Preprocessor preprocessor(settings, settings.nomsg, nullptr);
265265

@@ -2886,7 +2886,7 @@ class TestClass : public TestFixture {
28862886

28872887
#define checkNoMemset(...) checkNoMemset_(__FILE__, __LINE__, __VA_ARGS__)
28882888
void checkNoMemset_(const char* file, int line, const char code[]) {
2889-
const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
2889+
static const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
28902890
checkNoMemset_(file, line, code, settings);
28912891
}
28922892

@@ -3150,7 +3150,7 @@ class TestClass : public TestFixture {
31503150
errout.str());
31513151

31523152
// #1655
3153-
const Settings s = settingsBuilder().library("std.cfg").build();
3153+
static const Settings s = settingsBuilder().library("std.cfg").build();
31543154
checkNoMemset("void f() {\n"
31553155
" char c[] = \"abc\";\n"
31563156
" std::string s;\n"
@@ -7279,7 +7279,7 @@ class TestClass : public TestFixture {
72797279
errout.str("");
72807280

72817281
// Check..
7282-
const Settings settings = settingsBuilder().severity(Severity::performance).build();
7282+
static const Settings settings = settingsBuilder().severity(Severity::performance).build();
72837283

72847284
Preprocessor preprocessor(settings, settings.nomsg, nullptr);
72857285

@@ -7960,7 +7960,7 @@ class TestClass : public TestFixture {
79607960
// Clear the error log
79617961
errout.str("");
79627962

7963-
const Settings settings = settingsBuilder().severity(Severity::style).build();
7963+
static const Settings settings = settingsBuilder().severity(Severity::style).build();
79647964

79657965
Preprocessor preprocessor(settings, settings.nomsg, nullptr);
79667966

@@ -8317,7 +8317,7 @@ class TestClass : public TestFixture {
83178317

83188318

83198319
void ctu(const std::vector<std::string> &code) {
8320-
const Settings settings;
8320+
static const Settings settings;
83218321
auto &check = getCheck<CheckClass>();
83228322

83238323
// getFileInfo

‎test/testconstructors.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,8 +1947,8 @@ class TestConstructors : public TestFixture {
19471947
}
19481948

19491949
void initvar_smartptr() { // #10237
1950-
// TODO: test shuld probably not pass without library
1951-
const Settings s = settingsBuilder() /*.library("std.cfg")*/.build();
1950+
// TODO: test should probably not pass without library
1951+
static const Settings s = settingsBuilder() /*.library("std.cfg")*/.build();
19521952
check("struct S {\n"
19531953
" explicit S(const std::shared_ptr<S>& sp) {\n"
19541954
" set(*sp);\n"
@@ -1990,7 +1990,7 @@ class TestConstructors : public TestFixture {
19901990
"{ }", true);
19911991
ASSERT_EQUALS("[test.cpp:13]: (warning, inconclusive) Member variable 'Fred::ints' is not assigned a value in 'Fred::operator='.\n", errout.str());
19921992

1993-
const Settings s = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::style).severity(Severity::warning).library("std.cfg").build();
1993+
static const Settings s = settingsBuilder().certainty(Certainty::inconclusive).severity(Severity::style).severity(Severity::warning).library("std.cfg").build();
19941994
check("struct S {\n"
19951995
" S& operator=(const S& s) { return *this; }\n"
19961996
" std::mutex m;\n"
@@ -3603,7 +3603,7 @@ class TestConstructors : public TestFixture {
36033603

36043604
void uninitVarInheritClassInit() {
36053605
// TODO: test should probably not pass without library
3606-
const Settings s = settingsBuilder() /*.library("vcl.cfg")*/.build();
3606+
static const Settings s = settingsBuilder() /*.library("vcl.cfg")*/.build();
36073607

36083608
check("class Fred: public TObject\n"
36093609
"{\n"

‎test/testnullpointer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class TestNullPointer : public TestFixture {
194194
// Clear the error buffer..
195195
errout.str("");
196196

197-
const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, false).build();
197+
static const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, false).build();
198198

199199
// Raw tokens..
200200
std::vector<std::string> files(1, "test.cpp");

‎test/testsimplifytypedef.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class TestSimplifyTypedef : public TestFixture {
279279
errout.str("");
280280
// Tokenize..
281281
// show warnings about unhandled typedef
282-
const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
282+
static const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
283283
Tokenizer tokenizer(&settings, this);
284284
std::istringstream istr(code);
285285
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);

‎test/testsummaries.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class TestSummaries : public TestFixture {
4444
errout.str("");
4545

4646
// tokenize..
47-
const Settings settings;
47+
static const Settings settings;
4848
Tokenizer tokenizer(&settings, this);
4949
std::istringstream istr(code);
5050
ASSERT_LOC(tokenizer.tokenize(istr, filename), file, line);

‎test/testtoken.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ class TestToken : public TestFixture {
396396

397397
void getStrSize() const {
398398
Token tok;
399-
const Settings settings;
399+
static const Settings settings;
400400

401401
tok.str("\"\"");
402402
ASSERT_EQUALS(sizeof(""), Token::getStrSize(&tok, &settings));

‎test/testtokenize.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ class TestTokenizer : public TestFixture {
524524
std::string tokenizeDebugListing_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
525525
errout.str("");
526526

527-
const Settings settings = settingsBuilder(settings2).c(Standards::C89).cpp(Standards::CPP03).build();
527+
static const Settings settings = settingsBuilder(settings2).c(Standards::C89).cpp(Standards::CPP03).build();
528528

529529
Tokenizer tokenizer(&settings, this);
530530
std::istringstream istr(code);

0 commit comments

Comments
 (0)