Skip to content

Commit 097f2bf

Browse files
firewavefirewave
committed
made some local const Settings objects in test static 
1 parent fa24baa commit 097f2bf

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
@@ -48,7 +48,7 @@ class TestAstUtils : public TestFixture {
4848

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

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

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

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

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

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

232232
#define isVariableChangedByFunctionCall(code, pattern, inconclusive) isVariableChangedByFunctionCall_(code, pattern, inconclusive, __FILE__, __LINE__)
233233
bool isVariableChangedByFunctionCall_(const char code[], const char pattern[], bool *inconclusive, const char* file, int line) {
234-
const Settings settings;
234+
static const Settings settings;
235235
Tokenizer tokenizer(&settings, this);
236236
std::istringstream istr(code);
237237
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -260,7 +260,7 @@ class TestAstUtils : public TestFixture {
260260

261261
#define nextAfterAstRightmostLeaf(code, parentPattern, rightPattern) nextAfterAstRightmostLeaf_(code, parentPattern, rightPattern, __FILE__, __LINE__)
262262
bool nextAfterAstRightmostLeaf_(const char code[], const char parentPattern[], const char rightPattern[], const char* file, int line) {
263-
const Settings settings;
263+
static const Settings settings;
264264
Tokenizer tokenizer(&settings, this);
265265
std::istringstream istr(code);
266266
ASSERT_LOC(tokenizer.tokenize(istr, "test.cpp"), file, line);
@@ -285,7 +285,7 @@ class TestAstUtils : public TestFixture {
285285
enum class Result {False, True, Fail};
286286

287287
Result isUsedAsBool(const char code[], const char pattern[]) {
288-
const Settings settings;
288+
static const Settings settings;
289289
Tokenizer tokenizer(&settings, this);
290290
std::istringstream istr(code);
291291
if (!tokenizer.tokenize(istr, "test.cpp"))

‎test/testbufferoverrun.cpp‎

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

54885488
void checkPipeParameterSize() { // #3521
54895489

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

54925492
check("void f(){\n"
54935493
"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
@@ -138,7 +138,7 @@ class TestClangImport : public TestFixture {
138138
}
139139

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

‎test/testclass.cpp‎

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

259259
// Tokenize..
260260
Tokenizer tokenizer(&settings, this);
@@ -2867,7 +2867,7 @@ class TestClass : public TestFixture {
28672867

28682868
#define checkNoMemset(...) checkNoMemset_(__FILE__, __LINE__, __VA_ARGS__)
28692869
void checkNoMemset_(const char* file, int line, const char code[]) {
2870-
const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
2870+
static const Settings settings = settingsBuilder().severity(Severity::warning).severity(Severity::portability).build();
28712871
checkNoMemset_(file, line, code, settings);
28722872
}
28732873

@@ -3129,7 +3129,7 @@ class TestClass : public TestFixture {
31293129
errout.str());
31303130

31313131
// #1655
3132-
const Settings s = settingsBuilder().library("std.cfg").build();
3132+
static const Settings s = settingsBuilder().library("std.cfg").build();
31333133
checkNoMemset("void f() {\n"
31343134
" char c[] = \"abc\";\n"
31353135
" std::string s;\n"
@@ -7083,7 +7083,7 @@ class TestClass : public TestFixture {
70837083
errout.str("");
70847084

70857085
// Check..
7086-
const Settings settings = settingsBuilder().severity(Severity::performance).build();
7086+
static const Settings settings = settingsBuilder().severity(Severity::performance).build();
70877087

70887088
// Tokenize..
70897089
Tokenizer tokenizer(&settings, this);
@@ -7761,7 +7761,7 @@ class TestClass : public TestFixture {
77617761
// Clear the error log
77627762
errout.str("");
77637763

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

77667766
// Tokenize..
77677767
Tokenizer tokenizer(&settings, this);
@@ -8112,7 +8112,7 @@ class TestClass : public TestFixture {
81128112

81138113

81148114
void ctu(const std::vector<std::string> &code) {
8115-
const Settings settings;
8115+
static const Settings settings;
81168116
auto &check = getCheck<CheckClass>();
81178117

81188118
// getFileInfo

‎test/testconstructors.cpp‎

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

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

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

35833583
void uninitVarInheritClassInit() {
35843584
// TODO: test should probably not pass without library
3585-
const Settings s = settingsBuilder() /*.library("vcl.cfg")*/.build();
3585+
static const Settings s = settingsBuilder() /*.library("vcl.cfg")*/.build();
35863586

35873587
check("class Fred: public TObject\n"
35883588
"{\n"

‎test/testnullpointer.cpp‎

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

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

198198
// Raw tokens..
199199
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
@@ -258,7 +258,7 @@ class TestSimplifyTypedef : public TestFixture {
258258
errout.str("");
259259
// Tokenize..
260260
// show warnings about unhandled typedef
261-
const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
261+
static const Settings settings = settingsBuilder(settings2).certainty(Certainty::inconclusive).debugwarnings().build();
262262
Tokenizer tokenizer(&settings, this);
263263
std::istringstream istr(code);
264264
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
@@ -523,7 +523,7 @@ class TestTokenizer : public TestFixture {
523523
std::string tokenizeDebugListing_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
524524
errout.str("");
525525

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

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

0 commit comments

Comments
 (0)