Build ByteCode by make instead of shellExec

Author: Vladislav Kalugin

server/src/KleeGenerator.cpp

@@ -177,7 +177,18 @@ Result<fs::path> KleeGenerator::defaultBuild(const fs::path &hintPath,
     auto &command = optionalCommand.value();
     command.setSourcePath(sourceFilePath);
     command.setOutput(bitcodeFilePath);
-    auto [out, status, _] = ShellExecTask::executeUtbotCommand(command, buildDirPath, projectContext.projectName);
+
+    printer::DefaultMakefilePrinter makefilePrinter;
+    std::vector<fs::path> outfilePaths;
+
+    fs::path output = command.getOutput();
+    makefilePrinter.declareTarget("build", { command.getSourcePath() },
+                                  { command.toStringWithChangingDirectory() });
+    fs::path makefile = projectTmpPath / "BCForKLEE.mk";
+    FileSystemUtils::writeToFile(makefile, makefilePrinter.ss.str());
+
+    auto makefileCommand = MakefileUtils::makefileCommand(projectContext, makefile, "build");
+    auto [out, status, _] = makefileCommand.run();
     if (status != 0) {
         LOG_S(ERROR) << "Compilation for " << sourceFilePath << " failed.\n"
                      << "Command: \"" << command.toString() << "\"\n"

server/src/utils/StringUtils.cpp

@@ -141,4 +141,13 @@ namespace StringUtils {
         s.erase(std::remove(s.begin(), s.end(), '\n'), s.end());
     }
 
+    std::string stringLiteralView(const std::string& str) {
+        std::stringstream ss;
+        ss << "\"";
+        for(const auto &ch : str) {
+            ss << StringUtils::charCodeToLiteral(ch);
+        }
+        ss << "\"";
+        return ss.str();
+    }
 }

server/src/utils/StringUtils.h

@@ -78,6 +78,8 @@ namespace StringUtils {
     std::string repeat(const std::string &s, int n);
 
     bool contains(std::string_view s, std::string_view t);
+
+    std::string stringLiteralView(const std::string& str);
 }
 
 #endif //UNITTESTBOT_STRINGUTIL_H

server/test/framework/Regression_Tests.cpp

@@ -268,4 +268,64 @@ namespace {
                   } }),
             "hash");
     }
+
+    TEST_F(Regression_Test, Export_Empty) {
+        fs::path source = getTestFilePath("issue-276.c");
+        auto [testGen, status] = createTestForFunction(source, 2);
+
+        ASSERT_TRUE(status.ok()) << status.error_message();
+
+        checkTestCasePredicates(
+                testGen.tests.at(source).methods.begin().value().testCases,
+                std::vector<TestCasePredicate>(
+                        { [](const tests::Tests::MethodTestCase &testCase) {
+                            return testCase.returnValue.view->getEntryValue(nullptr) == "0";
+                        } }),
+                "f1");
+    }
+
+    TEST_F(Regression_Test, Export_Empty_String) {
+        fs::path source = getTestFilePath("issue-276.c");
+        auto [testGen, status] = createTestForFunction(source, 6);
+
+        ASSERT_TRUE(status.ok()) << status.error_message();
+
+        checkTestCasePredicates(
+                testGen.tests.at(source).methods.begin().value().testCases,
+                std::vector<TestCasePredicate>(
+                        { [](const tests::Tests::MethodTestCase &testCase) {
+                            return testCase.returnValue.view->getEntryValue(nullptr) == "'\\0'";
+                        } }),
+                "f2");
+    }
+
+    TEST_F(Regression_Test, Export_Int) {
+        fs::path source = getTestFilePath("issue-276.c");
+        auto [testGen, status] = createTestForFunction(source, 10);
+
+        ASSERT_TRUE(status.ok()) << status.error_message();
+
+        checkTestCasePredicates(
+                testGen.tests.at(source).methods.begin().value().testCases,
+                std::vector<TestCasePredicate>(
+                        { [](const tests::Tests::MethodTestCase &testCase) {
+                            return testCase.returnValue.view->getEntryValue(nullptr) == "4";
+                        } }),
+                "f3");
+    }
+
+    TEST_F(Regression_Test, Export_String_Int) {
+        fs::path source = getTestFilePath("issue-276.c");
+        auto [testGen, status] = createTestForFunction(source, 14);
+
+        ASSERT_TRUE(status.ok()) << status.error_message();
+
+        checkTestCasePredicates(
+                testGen.tests.at(source).methods.begin().value().testCases,
+                std::vector<TestCasePredicate>(
+                        { [](const tests::Tests::MethodTestCase &testCase) {
+                            return testCase.returnValue.view->getEntryValue(nullptr) == "'4'";
+                        } }),
+                "f4");
+    }
 }

server/test/suites/regression/CMakeLists.txt

@@ -40,4 +40,10 @@ add_library(PR153 PR153.c)
 
 add_library(GH215 GH215.c)
 
+add_library(issue-276 issue-276.c)
+target_compile_definitions(issue-276 PUBLIC EXPORT1=)
+target_compile_definitions(issue-276 PUBLIC EXPORT2="")
+target_compile_definitions(issue-276 PUBLIC EXPORT3=4)
+target_compile_definitions(issue-276 PUBLIC EXPORT4="4")
+
 set_target_properties(regression PROPERTIES LINK_WHAT_YOU_USE TRUE)

server/test/suites/regression/issue-276.c

@@ -0,0 +1,15 @@
+int EXPORT1 f1() {
+    return 0;
+}
+
+char* f2() {
+    return EXPORT2;
+}
+
+int f3() {
+    return EXPORT3;
+}
+
+char* f4() {
+    return EXPORT4;
+}