Update KLEE, fix small bugs

UnitTestBot · Sep 20, 2022 · 8c7cced · 8c7cced
1 parent 92a5078
commit 8c7cced
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/server/src/Server.cpp b/server/src/Server.cpp
@@ -423,7 +423,7 @@ Status Server::TestsGenServiceImpl::provideLoggingCallbacks(
          */
         using namespace std::chrono_literals;
         while (holdLockFlag[callbackName].exchange(true, std::memory_order_acquire)) {
-            std::this_thread::sleep_for(100ms);
+            std::this_thread::sleep_for(1ms);
         }
         loguru::remove_callback(callbackName.c_str());
         if (openFiles) {

diff --git a/server/src/building/Linker.cpp b/server/src/building/Linker.cpp
@@ -141,7 +141,8 @@ Result<Linker::LinkResult> Linker::linkWholeTarget(const fs::path &target) {
                 insideFolder = false;
             }
         }
-        if (!CollectionUtils::contains(testedFiles, objectInfo->getSourcePath()) && insideFolder) {
+        if ( CollectionUtils::contains(testGen.tests, objectInfo->getSourcePath()) &&
+             !CollectionUtils::contains(testedFiles, objectInfo->getSourcePath()) && insideFolder) {
             fs::path bitcodeFile = objectInfo->kleeFilesInfo->getKleeBitcodeFile();
             filesToLink.emplace(objectFile, bitcodeFile);
         } else {

diff --git a/server/test/framework/Syntax_Tests.cpp b/server/test/framework/Syntax_Tests.cpp
@@ -1464,7 +1464,7 @@ namespace {
     }
 
     TEST_F(Syntax_Test, Correct_CodeText_For_Regression_And_Error) {
-        auto [testGen, status] = createTestForFunction(linked_list_c, 3);
+        auto [testGen, status] = createTestForFunction(structs_with_pointers_c, 78);
         const std::string code = testGen.tests.begin()->second.code;
         const std::string beginRegressionRegion = "#pragma region " + Tests::DEFAULT_SUITE_NAME + NL;
         const std::string endRegion = std::string("#pragma endregion") + NL;
@@ -1982,9 +1982,6 @@ namespace {
                 {
                     [] (const tests::Tests::MethodTestCase& testCase) {
                     return stoi(testCase.returnValue.view->getEntryValue(nullptr)) == -1;
-                },
-                    [] (const tests::Tests::MethodTestCase& testCase) {
-                    return stoi(testCase.returnValue.view->getEntryValue(nullptr)) > -1;
                 }
             })
         );
@@ -2676,9 +2673,6 @@ namespace {
             testGen.tests.at(linked_list_c).methods.begin().value().testCases,
             std::vector<TestCasePredicate>(
                 {
-                    [] (const tests::Tests::MethodTestCase& testCase) {
-                      return stoi(testCase.returnValue.view->getEntryValue(nullptr)) == 0;
-                    },
                     [] (const tests::Tests::MethodTestCase& testCase) {
                       return stoi(testCase.returnValue.view->getEntryValue(nullptr)) == 1;
                     },

diff --git a/submodules/klee b/submodules/klee
+1 −1		CMakeLists.txt
+2 −1		include/klee/Core/Interpreter.h
+2 −0		include/klee/Module/KModule.h
+10 −9		lib/Core/AddressSpace.cpp
+4 −4		lib/Core/AddressSpace.h
+8 −3		lib/Core/CXXTypeSystem/CXXTypeManager.cpp
+8 −2		lib/Core/ExecutionState.cpp
+82 −81		lib/Core/Executor.cpp
+4 −2		lib/Core/Executor.h
+3 −0		lib/Core/Searcher.cpp
+8 −1		lib/Runner/run_klee.cpp
+1 −1		scripts/build/p-klee.inc