diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp index 8e32e3e3152..49ff02a8e81 100644 --- a/lib/cppcheck.cpp +++ b/lib/cppcheck.cpp @@ -349,7 +349,7 @@ static std::vector split(const std::string &str, const std::string return ret; } -static std::string getDumpFileName(const Settings& settings, const FileWithDetails& file) +static std::string getDumpFileName(const Settings& settings, const FileWithDetails& file, const std::string& cfg) { std::string extension = ".dump"; if (file.fsFileId() > 0) @@ -358,7 +358,7 @@ static std::string getDumpFileName(const Settings& settings, const FileWithDetai extension = "." + std::to_string(settings.pid) + extension; if (!settings.dump && !settings.buildDir.empty()) - return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, file.spath(), "", file.fsFileId()) + extension; + return AnalyzerInformation::getAnalyzerInfoFile(settings.buildDir, file.spath(), cfg, file.fsFileId()) + extension; return file.spath() + extension; } @@ -369,12 +369,13 @@ static std::string getCtuInfoFileName(const std::string &dumpFile) static void createDumpFile(const Settings& settings, const FileWithDetails& file, + const std::string& cfg, std::ofstream& fdump, std::string& dumpFile) { if (!settings.dump && settings.addons.empty()) return; - dumpFile = getDumpFileName(settings, file); + dumpFile = getDumpFileName(settings, file, cfg); fdump.open(dumpFile); if (!fdump.is_open()) @@ -765,7 +766,7 @@ unsigned int CppCheck::checkClang(const FileWithDetails &file) // create dumpfile std::ofstream fdump; std::string dumpFile; - createDumpFile(mSettings, file, fdump, dumpFile); + createDumpFile(mSettings, file, "", fdump, dumpFile); if (fdump.is_open()) { fdump << getLibraryDumpData(); // TODO: use tinyxml2 to create XML @@ -1136,7 +1137,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str // write dump file xml prolog std::ofstream fdump; std::string dumpFile; - createDumpFile(mSettings, file, fdump, dumpFile); + createDumpFile(mSettings, file, cfgname, fdump, dumpFile); if (fdump.is_open()) { fdump << getLibraryDumpData(); if (!mSettings.dump) @@ -1699,12 +1700,12 @@ void CppCheck::executeAddonsWholeProgram(const std::list &files std::vector ctuInfoFiles; for (const auto &f: files) { - const std::string &dumpFileName = getDumpFileName(mSettings, f); + const std::string &dumpFileName = getDumpFileName(mSettings, f, ""); ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName)); } for (const auto &fs: fileSettings) { - const std::string &dumpFileName = getDumpFileName(mSettings, fs.file); + const std::string &dumpFileName = getDumpFileName(mSettings, fs.file, fs.cfg); ctuInfoFiles.push_back(getCtuInfoFileName(dumpFileName)); } diff --git a/test/cli/dumpfile_test.py b/test/cli/dumpfile_test.py index 5dbb29f9e38..8433e4a1bbf 100644 --- a/test/cli/dumpfile_test.py +++ b/test/cli/dumpfile_test.py @@ -146,3 +146,33 @@ def test_line_macro(tmpdir): with open(dumpfile, 'rt') as f: dump = f.read() assert 'type="number" isInt="true" macroName="__LINE__"' in dump + + +def test_build_dir_project_configurations(tmp_path): + test_file = tmp_path / 'main.c' + with open(test_file, 'wt') as f: + f.write('int main(void) { return 0; }\n') + + configs = ''.join( + f'{c}{p}' + for c in ('Debug', 'Release') for p in ('Win32', 'x64')) + project_file = tmp_path / 'test.vcxproj' + with open(project_file, 'wt') as f: + f.write('' + '' + f'{configs}' + '' + '') + + build_dir = tmp_path / 'b' + os.mkdir(build_dir) + + args = ['-q', '--project=test.vcxproj', '--cppcheck-build-dir=b', '--addon=misra'] + exitcode, stdout, stderr = cppcheck(args, cwd=str(tmp_path)) + assert exitcode == 0, stdout + assert stderr == '' + + files = os.listdir(build_dir) + assert 'main.c.analyzerinfo.ctu-info' not in files + for i in range(1, 5): + assert f'main.a{i}.ctu-info' in files