Fixing generations for files that included in two targets

server/src/BordersFinder.cpp

@@ -17,7 +17,6 @@ BordersFinder::BordersFinder(const fs::path &filePath,
                              const std::shared_ptr<CompilationDatabase> &compilationDatabase,
                              const fs::path &compileCommandsJsonPath)
         : line(line), classBorder(std::nullopt), clangToolRunner(compilationDatabase) {
-    buildRootPath = Paths::subtractPath(compileCommandsJsonPath.string(), CompilationUtils::UTBOT_BUILD_DIR_NAME);
     lineInfo.filePath = filePath;
 }
 

server/src/BordersFinder.h

@@ -31,7 +31,6 @@ class BordersFinder : public clang::ast_matchers::MatchFinder::MatchCallback {
 private:
     unsigned line;
     LineInfo lineInfo{};
-    fs::path buildRootPath;
     struct Borders {
         struct Position {
             unsigned line;

server/src/KleeGenerator.h

@@ -15,12 +15,14 @@
 #include "streams/tests/TestsWriter.h"
 #include "types/Types.h"
 #include "utils/ExecUtils.h"
-
 #include "utils/path/FileSystemPath.h"
+#include "testgens/BaseTestGen.h"
+
 #include <optional>
 #include <sstream>
 #include <string>
 
+
 using json = nlohmann::json;
 
 /**
@@ -33,28 +35,16 @@ class KleeGenerator {
 public:
     /**
      * @brief Also creates tmp directories for build files.
-     * @param projectContext contains context about current project.
-     * @param settingsContext contains context about settings applied for current request.
-     * @param serverBuildDir Path to folder on server machine where project build dirs are located.
-     * @param sourcesFilePaths Paths to project files. Files which are listed in
-     * [compile_commands.json](https://clang.llvm.org/docs/JSONCompilationDatabase.html), filtered
-     * by them.
-     * @param compilationDatabase Pointer to compile_commands.json object.
+     * @param testGen contains request and build information.
      * @param typesHandler provides additional information about types.
      * @param filePathsSubstitution Mapping from source file path to modified file. Required for
      * line test generation requests.
      * @param buildDatabase Instance of BuildDatabase which handles link and compile commands
      * @throws fs::filesystem_error Thrown if it can't create tmp folder for some
      * reasons.
      */
-    KleeGenerator(utbot::ProjectContext projectContext,
-                  utbot::SettingsContext settingsContext,
-                  fs::path serverBuildDir,
-                  std::shared_ptr<CompilationDatabase> compilationDatabase,
-                  types::TypesHandler &typesHandler,
-                  PathSubstitution filePathsSubstitution,
-                  std::shared_ptr<BuildDatabase> buildDatabase = nullptr,
-                  const ProgressWriter *progressWriter = DummyStreamWriter::getInstance());
+    KleeGenerator(BaseTestGen *testGen, types::TypesHandler &typesHandler,
+                  PathSubstitution filePathsSubstitution);
 
     struct BuildFileInfo {
         fs::path outFilePath;
@@ -128,7 +118,7 @@ class KleeGenerator {
                            const std::shared_ptr<LineInfo> &lineInfo = nullptr,
                            bool verbose = false);
 
-    [[nodiscard]] std::shared_ptr<BuildDatabase> getBuildDatabase() const;
+    [[nodiscard]] fs::path getBitcodeFile(const fs::path &sourcePath) const;
 
     void handleFailedFunctions(tests::TestsMap &testsMap);
 
@@ -146,29 +136,25 @@ class KleeGenerator {
     std::optional<utbot::CompileCommand>
     getCompileCommandForKlee(const fs::path &hintPath,
                              const CollectionUtils::FileSet &stubSources,
-                             const std::vector<std::string> &flags) const;
+                             const std::vector<std::string> &flags,
+                             bool forStub) const;
 
     std::vector<utbot::CompileCommand>
     getCompileCommandsForKlee(const CollectionUtils::MapFileTo<fs::path> &filesToBuild,
                               const CollectionUtils::FileSet &stubSources) const;
 
 private:
-    const utbot::ProjectContext projectContext;
-    const utbot::SettingsContext settingsContext;
-    fs::path projectTmpPath;
-    std::shared_ptr<CompilationDatabase> compilationDatabase;
+    BaseTestGen *testGen;
     types::TypesHandler typesHandler;
     PathSubstitution pathSubstitution;
-    std::shared_ptr<BuildDatabase> buildDatabase;
-    const ProgressWriter *progressWriter;
 
     CollectionUtils::MapFileTo<std::vector<std::string>> failedFunctions;
 
     fs::path writeKleeFile(
-        printer::KleePrinter &kleePrinter,
-        Tests const &tests,
-        const std::shared_ptr<LineInfo> &lineInfo,
-        const std::function<bool(tests::Tests::MethodDescription const &)> &methodFilter =
+            printer::KleePrinter &kleePrinter,
+            Tests const &tests,
+            const std::shared_ptr<LineInfo> &lineInfo,
+            const std::function<bool(tests::Tests::MethodDescription const &)> &methodFilter =
             [](tests::Tests::MethodDescription const &) { return true; });
 };
 

server/src/Paths.cpp

@@ -27,7 +27,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/ReturnTypesFetcher.cpp

@@ -10,7 +10,7 @@ void ReturnTypesFetcher::fetch(ProgressWriter *const progressWriter,
         testsMap[filePath];
     }
     Fetcher(Fetcher::Options::Value::RETURN_TYPE_NAMES_ONLY,
-                 testGen->compilationDatabase, testsMap, nullptr, nullptr, nullptr,
+                 testGen->getTargetBuildDatabase()->compilationDatabase, testsMap, nullptr, nullptr, nullptr,
                  testGen->compileCommandsJsonPath, false)
         .fetchWithProgress(progressWriter, "Fetching return types for functions", true);
     for (auto const &[sourceFilePath, test] : testsMap) {