[refactoring] changed klee out directories for interactive mode

Author: Lana243

server/src/KleeRunner.cpp

@@ -93,13 +93,20 @@ void KleeRunner::runKlee(const std::vector<tests::TestMethod> &testMethods,
                                         std::move(writeFunctor));
 }
 
-fs::path KleeRunner::getKleeMethodOutFile(const TestMethod &method) {
+fs::path KleeRunner::getKleeMethodOutDir(const TestMethod &method) {
     fs::path kleeOutDir = Paths::getKleeOutDir(projectTmpPath);
     fs::path relative =
         Paths::removeExtension(fs::relative(method.sourceFilePath, projectContext.projectPath));
     return kleeOutDir / relative / ("klee_out_" + method.methodName);
 }
 
+fs::path KleeRunner::getKleeFileOutDir(const fs::path &filepath) {
+    fs::path kleeOutDir = Paths::getKleeOutDir(projectTmpPath);
+    fs::path relative = Paths::removeExtension(fs::relative(filepath, projectContext.projectPath));
+    return kleeOutDir / relative / ("klee_out_" + Paths::removeExtension(filepath.filename()).string());
+}
+
+
 namespace {
     void clearUnusedData(const fs::path &kleeDir) {
         fs::remove(kleeDir / "assembly.ll");
@@ -198,7 +205,7 @@ void KleeRunner::processBatchWithoutInteractive(MethodKtests &ktestChunk,
 
     std::string entryPoint = KleeUtils::entryPointFunction(tests, testMethod.methodName, true);
     std::string entryPointFlag = StringUtils::stringFormat("--entry-point=%s", entryPoint);
-    auto kleeOut = getKleeMethodOutFile(testMethod);
+    auto kleeOut = getKleeMethodOutDir(testMethod);
     fs::create_directories(kleeOut.parent_path());
     std::string outputDir = "--output-dir=" + kleeOut.string();
     std::vector<std::string> argvData = { "klee",
@@ -259,7 +266,7 @@ void KleeRunner::processBatchWithInteractive(const std::vector<tests::TestMethod
     TestMethod testMethod = testMethods[0];
     std::string entryPoint = KleeUtils::entryPointFunction(tests, testMethod.methodName, true);
     std::string entryPointFlag = StringUtils::stringFormat("--entry-point=%s", entryPoint);
-    auto kleeOut = getKleeMethodOutFile(testMethod);
+    auto kleeOut = getKleeFileOutDir(tests.sourceFilePath);
     fs::create_directories(kleeOut.parent_path());
 
     fs::path entrypoints = kleeOut.parent_path() / "entrypoints.txt";

server/src/KleeRunner.h

@@ -49,7 +49,8 @@ class KleeRunner {
     void processBatchWithInteractive(const std::vector<tests::TestMethod> &testMethods,
                                      tests::Tests &tests,
                                      std::vector<tests::MethodKtests> &ktests);
-    fs::path getKleeMethodOutFile(const tests::TestMethod &method);
+    fs::path getKleeMethodOutDir(const tests::TestMethod &method);
+    fs::path getKleeFileOutDir(const fs::path &filepath);
 };