Fix generate for folder

UnitTestBot · Jul 1, 2022 · 065aa10 · 065aa10
1 parent 2171673
commit 065aa10
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/server/src/building/Linker.cpp b/server/src/building/Linker.cpp
@@ -141,9 +141,6 @@ Result<Linker::LinkResult> Linker::linkWholeTarget(const fs::path &target) {
     CollectionUtils::FileSet siblingObjectsToBuild;
     for (const fs::path &objectFile : siblings) {
         auto objectInfo = testGen.buildDatabase->getClientCompilationUnitInfo(objectFile);
-        if (CollectionUtils::contains(stubSources, objectInfo->getSourcePath())) {
-            continue;
-        }
         bool insideFolder = true;
         if (auto folderTestGen = dynamic_cast<FolderTestGen *>(&testGen)) {
             fs::path folderGen = folderTestGen->folderPath;
@@ -154,12 +151,11 @@ Result<Linker::LinkResult> Linker::linkWholeTarget(const fs::path &target) {
         if (testGen.buildDatabase->isFirstObjectFileForSource(objectFile) &&
             !CollectionUtils::contains(testedFiles, objectInfo->getSourcePath()) &&
             insideFolder) {
-            filesToLink.insert(
-                { objectFile, objectInfo->kleeFilesInfo->getKleeBitcodeFile() });
+            filesToLink.emplace(objectFile, objectInfo->kleeFilesInfo->getKleeBitcodeFile());
         } else {
             siblingObjectsToBuild.insert(objectInfo->getOutputFile());
             fs::path bitcodeFile =
-                testGen.buildDatabase->getBitcodeForSource(objectInfo->getSourcePath());
+                    testGen.buildDatabase->getBitcodeForSource(objectInfo->getSourcePath());
             filesToLink.emplace(objectFile, bitcodeFile);
         }
     }

diff --git a/server/test/framework/Regression_Tests.cpp b/server/test/framework/Regression_Tests.cpp
@@ -27,7 +27,7 @@ namespace {
 
         std::pair<FunctionTestGen, Status>
         createTestForFunction(const fs::path &pathToFile, int lineNum, bool verbose = true) {
-            auto lineRequest = createLineRequest(projectName, suitePath, buildDirRelativePath,
+            auto lineRequest = testUtils::createLineRequest(projectName, suitePath, buildDirRelativePath,
                                                  srcPaths, pathToFile, lineNum, false, verbose, 0);
             auto request = GrpcUtils::createFunctionRequest(std::move(lineRequest));
             auto testGen = FunctionTestGen(*request, writer.get(), TESTMODE);
@@ -36,6 +36,18 @@ namespace {
             Status status = Server::TestsGenServiceImpl::ProcessBaseTestRequest(testGen, writer.get());
             return { testGen, status };
         }
+
+        std::pair<FolderTestGen, Status>
+        createTestForFolder(const fs::path &pathToFolder, bool useStubs = true, bool verbose = true) {
+            auto folderRequest = testUtils::createProjectRequest(projectName, suitePath, buildDirRelativePath,
+                                                                srcPaths, useStubs, verbose, 0);
+            auto request = GrpcUtils::createFolderRequest(std::move(folderRequest), pathToFolder);
+            auto testGen = FolderTestGen(*request, writer.get(), TESTMODE);
+            testGen.setTargetPath(GrpcUtils::UTBOT_AUTO_TARGET_PATH);
+
+            Status status = Server::TestsGenServiceImpl::ProcessBaseTestRequest(testGen, writer.get());
+            return {testGen, status};
+        }
     };
 
     // uint_32t parameters/return values and call external printf
@@ -328,4 +340,11 @@ namespace {
                         } }),
                 "f4");
     }
+
+    TEST_F(Regression_Test, Generate_Folder) {
+        fs::path folderPath = getTestFilePath("ISSUE-140");
+        auto [testGen, status] = createTestForFolder(folderPath, true, true);
+        ASSERT_TRUE(status.ok()) << status.error_message();
+        testUtils::checkMinNumberOfTests(testGen.tests, 1);
+    }
 }
diff --git a/server/test/suites/regression/CMakeLists.txt b/server/test/suites/regression/CMakeLists.txt
@@ -17,6 +17,9 @@ add_executable(
         SAT-777.c
         main.c)
 
+add_subdirectory(ISSUE-140)
+target_link_libraries(regression issue-140)
+
 add_library(
         SAT-760
         SAT-760/SAT-760_1.c

diff --git a/server/test/suites/regression/ISSUE-140/CMakeLists.txt b/server/test/suites/regression/ISSUE-140/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_library(issue-140)
+target_include_directories(issue-140 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+file(GLOB_RECURSE ALL_SOURCES "*.c" "*.h")
+target_sources(issue-140 PRIVATE ${ALL_SOURCES})
diff --git a/server/test/suites/regression/ISSUE-140/module/libfunc.c b/server/test/suites/regression/ISSUE-140/module/libfunc.c
@@ -0,0 +1,5 @@
+#include "libfunc.h"
+
+int libfunc(int a) {
+    return 10;
+}
diff --git a/server/test/suites/regression/ISSUE-140/module/libfunc.h b/server/test/suites/regression/ISSUE-140/module/libfunc.h
@@ -0,0 +1,6 @@
+#ifndef SIMPLE_TEST_PROJECT_LIBFUNC_H
+#define SIMPLE_TEST_PROJECT_LIBFUNC_H
+
+int libfunc(int a);
+
+#endif //SIMPLE_TEST_PROJECT_LIBFUNC_H