Skip to content

fixed #14108 - TestCppcheck: use unique names for generated files #7792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 10, 2025
Merged

fixed #14108 - TestCppcheck: use unique names for generated files #7792

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions test/testcppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class TestCppcheck : public TestFixture {
#endif
}

CppCheck::ExecuteCmdFn getExecuteCommand(int& called) const
CppCheck::ExecuteCmdFn getExecuteCommand(const std::string& fname, int& called) const
{
// cppcheck-suppress passedByValue - used as callback so we need to preserve the signature
// NOLINTNEXTLINE(performance-unnecessary-value-param) - used as callback so we need to preserve the signature
Expand All @@ -142,7 +142,7 @@ class TestCppcheck : public TestFixture {
ASSERT_EQUALS(4, args.size());
ASSERT_EQUALS("-quiet", args[0]);
ASSERT_EQUALS("-checks=*,-clang-analyzer-*,-llvm*", args[1]);
ASSERT_EQUALS("test.cpp", args[2]);
ASSERT_EQUALS(fname, args[2]);
ASSERT_EQUALS("--", args[3]);
ASSERT_EQUALS("2>&1", redirect);
return EXIT_SUCCESS;
Expand All @@ -166,10 +166,10 @@ class TestCppcheck : public TestFixture {
};
}

void checkWithFileInternal(bool tools, bool nocmd = false) const
void checkWithFileInternal(const std::string& fname, bool tools, bool nocmd = false) const
{
REDIRECT;
ScopedFile file("test.cpp",
ScopedFile file(fname,
"int main()\n"
"{\n"
" int i = *((int*)0);\n"
Expand All @@ -193,7 +193,7 @@ class TestCppcheck : public TestFixture {
ErrorLogger2 errorLogger;
CppCheck::ExecuteCmdFn f;
if (tools && !nocmd) {
f = getExecuteCommand(called);
f = getExecuteCommand(fname, called);
}
CppCheck cppcheck(s, supprs, errorLogger, false, f);
ASSERT_EQUALS(1, cppcheck.check(FileWithDetails(file.path(), Path::identify(file.path(), false), 0)));
Expand Down Expand Up @@ -240,21 +240,21 @@ class TestCppcheck : public TestFixture {
}

void checkWithFile() const {
checkWithFileInternal(false);
checkWithFileInternal("file.cpp", false);
}

void checkWithFileWithTools() const {
checkWithFileInternal(true);
checkWithFileInternal("file_tools.cpp", true);
}

void checkWithFileWithToolsNoCommand() const {
checkWithFileInternal(true, true);
checkWithFileInternal("file_tools_nocmd.cpp", true, true);
}

void checkWithFSInternal(bool tools, bool nocmd = false) const
void checkWithFSInternal(const std::string& fname, bool tools, bool nocmd = false) const
{
REDIRECT;
ScopedFile file("test.cpp",
ScopedFile file(fname,
"int main()\n"
"{\n"
" int i = *((int*)0);\n"
Expand All @@ -278,7 +278,7 @@ class TestCppcheck : public TestFixture {
ErrorLogger2 errorLogger;
CppCheck::ExecuteCmdFn f;
if (tools && !nocmd) {
f = getExecuteCommand(called);
f = getExecuteCommand(fname, called);
}
CppCheck cppcheck(s, supprs, errorLogger, false, f);
FileSettings fs{file.path(), Path::identify(file.path(), false), 0};
Expand Down Expand Up @@ -325,20 +325,20 @@ class TestCppcheck : public TestFixture {
}

void checkWithFS() const {
checkWithFSInternal(false);
checkWithFSInternal("fs.cpp", false);
}

void checkWithFSWithTools() const {
checkWithFSInternal(true);
checkWithFSInternal("fs_tools.cpp", true);
}

void checkWithFSWithToolsNoCommand() const {
checkWithFSInternal(true, true);
checkWithFSInternal("fs_tools_nocmd.cpp", true, true);
}

void suppress_error_library() const
{
ScopedFile file("test.cpp",
ScopedFile file("suppr_err_lib.cpp",
"int main()\n"
"{\n"
" int i = *((int*)0);\n"
Expand Down