link & gtest command finished & add env vars to makefile

Samat Gaynutdinov · Samat Gaynutdinov · commit 610f8475738b · 2022-04-26T20:55:32.000+03:00
diff --git a/server/src/Paths.cpp b/server/src/Paths.cpp
@@ -194,19 +194,20 @@ namespace Paths {
         return getArtifactsRootDir(projectContext) / "tests";
     }
     fs::path getMakefileDir(const utbot::ProjectContext &projectContext, const fs::path &sourceFilePath) {
-        return getArtifactsRootDir(projectContext) / "make" / getRelativeDirPath(projectContext, sourceFilePath);
+//        return getArtifactsRootDir(projectContext) / "make" / getRelativeDirPath(projectContext, sourceFilePath);
+        return getGeneratedHeaderDir(projectContext, sourceFilePath);
     }
     fs::path getGeneratedHeaderDir(const utbot::ProjectContext &projectContext, const fs::path &sourceFilePath) {
         return projectContext.testDirPath / getRelativeDirPath(projectContext, sourceFilePath);
     }
     fs::path getRecompiledDir(const utbot::ProjectContext &projectContext) {
-        return getTmpDir(projectContext.projectName) / "recompiled";
+        return getTmpDir(projectContext) / "recompiled";
     }
     fs::path getTestObjectDir(const utbot::ProjectContext &projectContext) {
-        return getTmpDir(projectContext.projectName) / "test_objects";
+        return getTmpDir(projectContext) / "test_objects";
     }
     fs::path getCoverageDir(const utbot::ProjectContext &projectContext) {
-        return getTmpDir(projectContext.projectName) / "coverage";
+        return getTmpDir(projectContext) / "coverage";
     }
     fs::path getClangCoverageDir(const utbot::ProjectContext &projectContext) {
         return getCoverageDir(projectContext) / "lcov";
@@ -249,15 +250,15 @@ namespace Paths {
 
     fs::path getBuildFilePath(const utbot::ProjectContext &projectContext,
                               const fs::path &sourceFilePath) {
-        fs::path path = getTmpDir(projectContext.projectName) /
+        fs::path path = getTmpDir(projectContext) /
                         getRelativeDirPath(projectContext, sourceFilePath) /
                         sourceFilePath.filename();
         return addExtension(path, ".o");
     }
 
     fs::path getStubBuildFilePath(const utbot::ProjectContext &projectContext,
                                   const fs::path &sourceFilePath) {
-        fs::path path = getTmpDir(projectContext.projectName) /
+        fs::path path = getTmpDir(projectContext) /
                         getRelativeDirPath(projectContext, sourceFilePath) /
                         sourcePathToStubName(sourceFilePath);
         return addExtension(path, ".o");
@@ -359,6 +360,18 @@ namespace Paths {
         return fs::relative(source.parent_path(), projectContext.projectPath);
     }
 
+    std::optional<std::string> getRelativePathWithShellVariable(const string &shellVariableForBase,
+                                                 const fs::path &base,
+                                                 const fs::path &source) {
+
+        auto relative = fs::relative(source, base).string();
+        if (relative.empty() || StringUtils::contains(relative, "..")) {
+            return std::nullopt;
+        }
+        return std::make_optional(StringUtils::stringFormat("%s/%s", shellVariableForBase, fs::relative(source, base)));
+    }
+
+
     fs::path stubPathToSourcePath(const utbot::ProjectContext &projectContext,
                                   const fs::path &stubPath) {
         fs::path sourceFilePath =
@@ -371,7 +384,13 @@ namespace Paths {
         return removeSuffix(srcPath, STUB_SUFFIX).stem() == headerPath.stem();
     }
     fs::path getBuildDir(const utbot::ProjectContext &projectContext) {
-        return getTmpDir(projectContext.projectName) / "build";
+        return projectContext.buildDir;
+    }
+
+    fs::path getTmpDir(const utbot::ProjectContext &projectContext)
+    {
+        fs::path mountedCCJsonDirPath = getBuildDir(projectContext) / CompilationUtils::MOUNTED_CC_JSON_DIR_NAME;
+        return mountedCCJsonDirPath / "tmp" / RequestEnvironment::getClientId();
     }
 
     //endregion
diff --git a/server/src/Paths.h b/server/src/Paths.h
@@ -170,8 +170,14 @@ namespace Paths {
         return tmpPath / "tmp" / RequestEnvironment::getClientId() / projectName;
     }
 
+    fs::path getTmpDir(const utbot::ProjectContext &projectContext);
+
     fs::path getBuildDir(const utbot::ProjectContext &projectContext);
 
+    static inline fs::path getBuildDirRelative(const utbot::ProjectContext &projectContext) {
+        return projectContext.buildDirRelativePath;
+    }
+
     //region json
     static inline fs::path getClientsJsonPath() {
         return tmpPath / "tmp" / "clients.json";
@@ -347,6 +353,10 @@ namespace Paths {
 
     fs::path getRelativeDirPath(const utbot::ProjectContext &projectContext, const fs::path &source);
 
+    std::optional<std::string> getRelativePathWithShellVariable(const string& shellVariableForBase,
+                                              const fs::path& base,
+                                              const fs::path& source);
+
     fs::path getMakefilePathFromSourceFilePath(const utbot::ProjectContext &projectContext, const fs::path &sourceFilePath,
                                                const string& suffix = "");
 
diff --git a/server/src/Server.cpp b/server/src/Server.cpp
@@ -574,8 +574,9 @@ Status Server::TestsGenServiceImpl::PrintModulesContent(ServerContext *context,
 
     MEASURE_FUNCTION_EXECUTION_TIME
 
-    fs::path serverBuildDir = Paths::getTmpDir(request->projectname());
+//    fs::path serverBuildDir = Paths::getTmpDir(request->projectname());
     utbot::ProjectContext projectContext{ *request };
+    fs::path serverBuildDir = Paths::getTmpDir(projectContext);
     shared_ptr<BuildDatabase> buildDatabase = BuildDatabase::create(projectContext);
     StubSourcesFinder(buildDatabase).printAllModules();
     return Status::OK;
diff --git a/server/src/Synchronizer.cpp b/server/src/Synchronizer.cpp
@@ -155,7 +155,7 @@ void Synchronizer::synchronizeStubs(StubSet &outdatedStubs,
                            true);
 
     fs::path ccJsonStubDirPath =
-        Paths::getTmpDir(testGen->projectContext.projectName) / "stubs_build_files";
+        Paths::getTmpDir(testGen->projectContext) / "stubs_build_files";
     auto stubsCdb = createStubsCompilationDatabase(stubFiles, ccJsonStubDirPath);
 
     auto sourceToHeaderRewriter =
diff --git a/server/src/building/BaseCommand.cpp b/server/src/building/BaseCommand.cpp
@@ -124,4 +124,8 @@ namespace utbot {
             optimizationLevel = addFlagToBegin(flag);
         }
     }
+
+    void BaseCommand::setDirectory(const fs::path& directory) {
+        this->directory = directory;
+    }
 }
diff --git a/server/src/building/BaseCommand.h b/server/src/building/BaseCommand.h
@@ -90,6 +90,8 @@ namespace utbot {
         size_t erase_if(std::function<bool(std::string)> f);
 
         void setOptimizationLevel(const std::string &flag);
+
+        void setDirectory(const fs::path& directory);
     };
 }
 
diff --git a/server/src/building/BuildDatabase.cpp b/server/src/building/BuildDatabase.cpp
@@ -60,7 +60,7 @@ std::shared_ptr<BuildDatabase> BuildDatabase::create(const utbot::ProjectContext
     fs::path compileCommandsJsonPath =
         CompilationUtils::substituteRemotePathToCompileCommandsJsonPath(
             projectContext.projectPath, projectContext.buildDirRelativePath);
-    fs::path serverBuildDir = Paths::getTmpDir(projectContext.projectName);
+    fs::path serverBuildDir = Paths::getTmpDir(projectContext);
     std::shared_ptr<BuildDatabase> buildDatabase =
         std::make_shared<BuildDatabase>(compileCommandsJsonPath, serverBuildDir, projectContext);
     return buildDatabase;
diff --git a/server/src/building/CompileCommand.cpp b/server/src/building/CompileCommand.cpp
@@ -111,7 +111,7 @@ namespace utbot {
         return *sourcePath;
     }
 
-    void CompileCommand::setSourcePath(fs::path sourcePath) {
+    void CompileCommand::setSourcePath(std::string sourcePath) {
         *(this->sourcePath) = std::move(sourcePath);
     }
 
@@ -131,7 +131,7 @@ namespace utbot {
         return false;
     }
 
-    void CompileCommand::setOutput(fs::path output) {
+    void CompileCommand::setOutput(std::string output) {
         *(this->output) = std::move(output);
     }
 
diff --git a/server/src/building/CompileCommand.h b/server/src/building/CompileCommand.h
@@ -39,7 +39,7 @@ namespace utbot {
 
         [[nodiscard]] fs::path getSourcePath() const;
 
-        void setSourcePath(fs::path sourcePath);
+        void setSourcePath(std::string sourcePath);
 
         [[nodiscard]] fs::path getCompiler() const;
 
@@ -49,7 +49,7 @@ namespace utbot {
 
         [[nodiscard]] bool isArchiveCommand() const override;
 
-        void setOutput(fs::path output);
+        void setOutput(std::string output);
 
         void removeGccFlags();
 
diff --git a/server/src/environment/EnvironmentPaths.cpp b/server/src/environment/EnvironmentPaths.cpp
@@ -50,11 +50,11 @@ namespace Paths {
     }
 
     fs::path getUTBotClang() {
-        return getUTBotInstallDir() / "bin/clang";
+        return getUTBotInstallDir() / "bin" / "clang";
     }
 
     fs::path getUTBotClangPP() {
-        return getUTBotInstallDir() / "bin/clang++";
+        return getUTBotInstallDir() / "bin" / "clang++";
     }
 
     fs::path getGcc() {
diff --git a/server/src/printers/NativeMakefilePrinter.cpp b/server/src/printers/NativeMakefilePrinter.cpp
diff --git a/server/src/printers/NativeMakefilePrinter.h b/server/src/printers/NativeMakefilePrinter.h
diff --git a/server/src/stubs/StubGen.cpp b/server/src/stubs/StubGen.cpp
diff --git a/server/src/testgens/BaseTestGen.cpp b/server/src/testgens/BaseTestGen.cpp

Original file line number	Diff line number	Diff line change
`@@ -124,4 +124,8 @@ namespace utbot {`
`124`	`124`	`optimizationLevel = addFlagToBegin(flag);`
`125`	`125`	`}`
`126`	`126`	`}`
	`127`	`+`
	`128`	`+ void BaseCommand::setDirectory(const fs::path& directory) {`
	`129`	`+ this->directory = directory;`
	`130`	`+ }`
`127`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ namespace utbot {`
`90`	`90`	`size_t erase_if(std::function<bool(std::string)> f);`
`91`	`91`
`92`	`92`	`void setOptimizationLevel(const std::string &flag);`
	`93`	`+`
	`94`	`+ void setDirectory(const fs::path& directory);`
`93`	`95`	`};`
`94`	`96`	`}`
`95`	`97`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ namespace utbot {`
`111`	`111`	`return *sourcePath;`
`112`	`112`	`}`
`113`	`113`
`114`		`- void CompileCommand::setSourcePath(fs::path sourcePath) {`
	`114`	`+ void CompileCommand::setSourcePath(std::string sourcePath) {`
`115`	`115`	`*(this->sourcePath) = std::move(sourcePath);`
`116`	`116`	`}`
`117`	`117`
`@@ -131,7 +131,7 @@ namespace utbot {`
`131`	`131`	`return false;`
`132`	`132`	`}`
`133`	`133`
`134`		`- void CompileCommand::setOutput(fs::path output) {`
	`134`	`+ void CompileCommand::setOutput(std::string output) {`
`135`	`135`	`*(this->output) = std::move(output);`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,11 @@ namespace Paths {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`fs::path getUTBotClang() {`
`53`		`- return getUTBotInstallDir() / "bin/clang";`
	`53`	`+ return getUTBotInstallDir() / "bin" / "clang";`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`fs::path getUTBotClangPP() {`
`57`		`- return getUTBotInstallDir() / "bin/clang++";`
	`57`	`+ return getUTBotInstallDir() / "bin" / "clang++";`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`fs::path getGcc() {`