Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/multiCondition/good.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ int main()
{
f(true);
return 0;
}
}
14 changes: 7 additions & 7 deletions test/cli/other_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def test_progress(tmpdir):
int main(int argc)
{
}
""")
""")

args = ['--report-progress=0', '--enable=all', '--inconclusive', '-j1', test_file]

Expand Down Expand Up @@ -248,7 +248,7 @@ def test_progress_j(tmpdir):
int main(int argc)
{
}
""")
""")

args = ['--report-progress=0', '--enable=all', '--inconclusive', '-j2', '--disable=unusedFunction', test_file]

Expand Down Expand Up @@ -2764,7 +2764,7 @@ def __test_addon_suppr(tmp_path, extra_args):
// cppcheck-suppress misra-c2012-2.3
typedef int MISRA_5_6_VIOLATION;
typedef int MISRA_5_6_VIOLATION_1;
""")
""")

args = [
'-q',
Expand Down Expand Up @@ -2818,7 +2818,7 @@ def test_ctu_path_builddir(tmp_path): # #11883
int *p = 0;
f(p);
}
""")
""")

args = [
'-q',
Expand Down Expand Up @@ -4522,7 +4522,7 @@ def run_and_assert_cppcheck(stdout_exp):

# modified file
with open(test_file, 'a') as f:
f.write('\n#define DEF')
f.write('\n#define DEF\n')

run_and_assert_cppcheck([
"discarding cached result from '{}' for '{}' - hash mismatch".format(test_a1_file_s, test_file_s)
Expand Down Expand Up @@ -4930,10 +4930,10 @@ def test_ipc_inline_suppressions(tmp_path):
def test_ipc_hash_suppressions(tmp_path):
test_file = tmp_path / 'test.c'
with open(test_file, "w") as f:
f.write('void f() { int x = 1; }')
f.write('void f() { int x = 1; }\n')

_, _, stderr = cppcheck(['--enable=style', '--xml-version=3', str(test_file)])
error_hash = ElementTree.fromstring(stderr).find('.//error').get('hash')
error_hash = ElementTree.fromstring(stderr).find(".//error[@id='unreadVariable']").get('hash')

suppr_file = tmp_path / 'suppr.xml'
with open(suppr_file, "w") as f:
Expand Down
2 changes: 1 addition & 1 deletion test/cli/whole-program/odr.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ class Base {
};

extern Base *c1_create();
extern Base *c2_create();
extern Base *c2_create();