@@ -1414,12 +1414,14 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
1414
1414
if (mSettings .addons .empty () || files.empty ())
1415
1415
return ;
1416
1416
1417
- FilesDeleter filesDeleter ;
1417
+ const bool isCtuInfo = endsWith (files[ 0 ], " .ctu-info " ) ;
1418
1418
1419
+ FilesDeleter filesDeleter;
1419
1420
std::string fileList;
1420
1421
1421
- if (files.size () >= 2 || endsWith (files[0 ], " .ctu-info" )) {
1422
- fileList = Path::getPathFromFilename (files[0 ]) + FILELIST;
1422
+ if (files.size () >= 2 ) {
1423
+ fileList = Path::getPathFromFilename (files[0 ]) + FILELIST + (" -" + std::to_string (mSettings .pid )) + " .txt" ;
1424
+ filesDeleter.addFile (fileList);
1423
1425
std::ofstream fout (fileList);
1424
1426
for (const std::string& f: files)
1425
1427
fout << f << std::endl;
@@ -1431,7 +1433,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
1431
1433
std::string ctuInfo;
1432
1434
1433
1435
for (const AddonInfo &addonInfo : mSettings .addonInfos ) {
1434
- if (addonInfo.name != " misra" && !addonInfo.ctu && endsWith (files. back (), " .ctu-info " ) )
1436
+ if (isCtuInfo && addonInfo.name != " misra" && !addonInfo.ctu )
1435
1437
continue ;
1436
1438
1437
1439
const std::vector<picojson::value> results =
@@ -1497,7 +1499,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
1497
1499
}
1498
1500
}
1499
1501
1500
- if (!mSettings .buildDir .empty () && fileList. empty () ) {
1502
+ if (!mSettings .buildDir .empty () && !isCtuInfo ) {
1501
1503
const std::string& ctuInfoFile = getCtuInfoFileName (files[0 ]);
1502
1504
std::ofstream fout (ctuInfoFile);
1503
1505
fout << ctuInfo;
0 commit comments