Fixing generations for files that included in two targets

Author: Vladislav Kalugin

server/src/KleeGenerator.cpp

@@ -245,7 +245,7 @@ std::vector<fs::path> KleeGenerator::buildKleeFiles(const tests::TestsMap &tests
                 return;
             }
             kleePrinter.srcLanguage = Paths::getSourceLanguage(filename);
-            auto includeFlags = { StringUtils::stringFormat("-I%s",
+            std::vector<std::string> includeFlags = { StringUtils::stringFormat("-I%s",
                                                             Paths::getFlagsDir(projectContext)) };
             auto buildDirPath =
                 buildDatabase->getClientCompilationUnitInfo(filename)->getDirectory();

server/src/Paths.cpp

@@ -28,7 +28,7 @@ namespace Paths {
         CollectionUtils::FileSet filtered =
             CollectionUtils::filterOut(paths, [&dirPaths, &filter](const fs::path &path) {
                 return !std::any_of(dirPaths.begin(), dirPaths.end(), [&](const fs::path &dirPath) {
-                    return path.parent_path() == dirPath && fs::exists(path) && filter(path);
+                    return isSubPathOf(dirPath, path) && fs::exists(path) && filter(path);
                 });
             });
         return filtered;

server/src/Server.cpp

@@ -209,10 +209,6 @@ Status Server::TestsGenServiceImpl::ProcessBaseTestRequest(BaseTestGen &testGen,
         Synchronizer synchronizer(&testGen, &stubGen, &sizeContext);
         synchronizer.synchronize(typesHandler);
 
-        if(testGen.settingsContext.useStubs) {
-            testsWriter->writeStubs(testGen.synchronizedStubs);
-        }
-
         std::shared_ptr<LineInfo> lineInfo = nullptr;
         auto lineTestGen = dynamic_cast<LineTestGen *>(&testGen);
 

server/src/building/BaseCommand.cpp

@@ -7,11 +7,11 @@
 #include "tasks/ShellExecTask.h"
 #include "utils/CollectionUtils.h"
 #include "utils/StringUtils.h"
+#include "utils/path/FileSystemPath.h"
 
 #include "loguru.h"
 
 #include <algorithm>
-#include "utils/path/FileSystemPath.h"
 #include <iterator>
 #include <set>
 #include <utility>
@@ -21,6 +21,7 @@ namespace utbot {
         : commandLine(std::move(commandLine)), directory(std::move(directory)) {
         initOptimizationLevel();
     }
+
     BaseCommand::BaseCommand(std::vector<std::string> commandLine, fs::path directory)
         : commandLine(commandLine.begin(), commandLine.end()), directory(std::move(directory)) {
         initOptimizationLevel();

server/src/building/Linker.cpp

@@ -151,16 +151,13 @@ Result<Linker::LinkResult> Linker::linkWholeTarget(const fs::path &target) {
                 insideFolder = false;
             }
         }
-        if (testGen.buildDatabase->isFirstObjectFileForSource(objectFile) &&
-            !CollectionUtils::contains(testedFiles, objectInfo->getSourcePath()) &&
-            insideFolder) {
-            filesToLink.insert(
-                { objectFile, objectInfo->kleeFilesInfo->getKleeBitcodeFile() });
+        if (!CollectionUtils::contains(testedFiles, objectInfo->getSourcePath()) && insideFolder) {
+            fs::path bitcodeFile = objectInfo->kleeFilesInfo->getKleeBitcodeFile();
+            filesToLink.emplace(objectFile, std::move(bitcodeFile));
         } else {
+            fs::path bitcodeFile = testGen.buildDatabase->getBitcodeForSource(objectInfo->getSourcePath());
             siblingObjectsToBuild.insert(objectInfo->getOutputFile());
-            fs::path bitcodeFile =
-                testGen.buildDatabase->getBitcodeForSource(objectInfo->getSourcePath());
-            filesToLink.emplace(objectFile, bitcodeFile);
+            filesToLink.emplace(objectFile, std::move(bitcodeFile));
         }
     }
 
@@ -669,7 +666,7 @@ Linker::getLinkActionsForExecutable(fs::path const &workingDir,
                                     CollectionUtils::MapFileTo<fs::path> const &dependencies,
                                     BuildDatabase::TargetInfo const &linkUnitInfo,
                                     fs::path const &output) {
-    
+
     using namespace DynamicLibraryUtils;
 
     auto commands = CollectionUtils::transform(

server/test/framework/Server_Tests.cpp

@@ -1520,10 +1520,10 @@ namespace {
         }
     };
 
-    const std::vector<ProjectInfo> testRelativeDirs = { { fs::path("executable"), 3 },
-                                                        { fs::path("static_library"), 3 },
-                                                        { fs::path("shared_library"), 3 },
-                                                        { fs::path("timeout"), 1 } };
+    const std::vector<ProjectInfo> testRelativeDirs = { { fs::path("executable"), 6 },
+                                                        { fs::path("static_library"), 6 },
+                                                        { fs::path("shared_library"), 6 },
+                                                        { fs::path("timeout"), 2 } };
 
     INSTANTIATE_TEST_SUITE_P(
         DifferentCompilersAndSuites,