Skip to content

Commit 158e633

Browse files
committed
Fix CI
1 parent 6271ad9 commit 158e633

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

test/testgarbage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,6 @@ class TestGarbage : public TestFixture {
18321832
ASSERT_THROW_INTERNAL(checkCode("void f(){x=0,return return''[]()}"), SYNTAX);
18331833
ASSERT_THROW_INTERNAL(checkCode("void f(){x='0'++'0'(return)[];}"), SYNTAX); // #9063
18341834
(void)checkCode("void f(){*(int *)42=0;}"); // no syntax error
1835-
ignore_errout(); // we are not interested in the output
18361835
ASSERT_THROW_INTERNAL(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }"), SYNTAX); // #9067
18371836
ASSERT_THROW_INTERNAL(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }"), SYNTAX); // #9068
18381837
ASSERT_THROW_INTERNAL(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }"), SYNTAX); // #9069

test/testother.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3097,7 +3097,7 @@ class TestOther : public TestFixture {
30973097
" x.dostuff();\n"
30983098
" const U& y = (const U&)(x);\n"
30993099
"}");
3100-
ASSERT_EQUALS("[test.cpp:4:19]: (style) C-style reference casting [cstyleCast]\n"
3100+
ASSERT_EQUALS("[test.cpp:4:18]: (style) C-style reference casting [cstyleCast]\n"
31013101
"[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n",
31023102
errout_str());
31033103
check("struct T : public U { void dostuff() const {}};\n"
@@ -3112,7 +3112,7 @@ class TestOther : public TestFixture {
31123112
" x.dostuff();\n"
31133113
" const U& y = (typename const U&)(x);\n"
31143114
"}");
3115-
ASSERT_EQUALS("[test.cpp:4:0]: (style) C-style reference casting [cstyleCast]\n"
3115+
ASSERT_EQUALS("[test.cpp:4:18]: (style) C-style reference casting [cstyleCast]\n"
31163116
"[test.cpp:2:11]: (style) Parameter 'x' can be declared as reference to const [constParameterReference]\n",
31173117
errout_str());
31183118
check("struct T : public U { void dostuff() const {}};\n"
@@ -3573,7 +3573,7 @@ class TestOther : public TestFixture {
35733573
"void g(A* a) {\n"
35743574
" const B* b = (const B*)a;\n"
35753575
"}\n");
3576-
ASSERT_EQUALS("[test.cpp:10:19]: (style) C-style pointer casting [cstyleCast]\n"
3576+
ASSERT_EQUALS("[test.cpp:10:18]: (style) C-style pointer casting [cstyleCast]\n"
35773577
"[test.cpp:6:11]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n"
35783578
"[test.cpp:9:11]: (style) Parameter 'a' can be declared as pointer to const [constParameterPointer]\n",
35793579
errout_str());
@@ -4339,8 +4339,7 @@ class TestOther : public TestFixture {
43394339
"void f(T* t) {\n"
43404340
" S* s = (S*)t->p;\n"
43414341
"}\n");
4342-
ASSERT_EQUALS("[test.cpp:3:12]: (style) C-style pointer casting [cstyleCast]\n"
4343-
"[test.cpp:3:8]: (style) Variable 's' can be declared as pointer to const [constVariablePointer]\n",
4342+
ASSERT_EQUALS("[test.cpp:3:8]: (style) Variable 's' can be declared as pointer to const [constVariablePointer]\n",
43444343
errout_str()); // don't crash
43454344

43464345
check("struct S { int i; };\n" // #12205
@@ -10160,7 +10159,7 @@ class TestOther : public TestFixture {
1016010159
" *reg = 12;\n"
1016110160
" *reg = 34;\n"
1016210161
"}");
10163-
ASSERT_EQUALS("[test.cpp:2:25]: style: C-style pointer casting [cstyleCast]\n", errout_str());
10162+
ASSERT_EQUALS("", errout_str());
1016410163

1016510164
check("void f(std::map<int, int>& m, int key, int value) {\n" // #6379
1016610165
" m[key] = value;\n"

0 commit comments

Comments
 (0)