Update KLEE

.github/workflows/matrix.json

@@ -1,7 +1,7 @@
 {
   "include": [
     {
-      "DOCKER_TAG": "2024.03.0",
+      "DOCKER_TAG": "2024.08.0",
       "OPERATING_SYSTEM_TAG": "20.04",
       "LLVM_VERSION_MAJOR": "14"
     }

docker/Dockerfile_base

@@ -20,7 +20,7 @@ WORKDIR docker
 # Install required system packages
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends sudo file python3-dateutil wget fakeroot libssl-dev build-essential \
-      software-properties-common
+      software-properties-common pkg-config
 RUN echo "check_certificate = off" > /etc/wgetrc
 
 # We use C++ 17 for UnitTestBot, it is available in gcc-9; default gcc for ubuntu:18.04 is gcc-7
@@ -217,6 +217,8 @@ RUN ./configure --make-llvm-lib && make -j`nproc`
 
 # Download library for access private members
 RUN git clone https://github.com/martong/access_private.git $UTBOT_ALL/access_private
+RUN git clone https://github.com/arximboldi/immer.git $UTBOT_ALL/immer
+RUN git clone https://github.com/nlohmann/json.git $UTBOT_ALL/json
 
 RUN apt autoclean
 

server/src/KleeRunner.cpp

@@ -58,9 +58,9 @@ void KleeRunner::runKlee(const std::vector<tests::TestMethod> &testMethods,
     LOG_SCOPE_FUNCTION(DEBUG);
 
     fs::path kleeOutDir = Paths::getKleeOutDir(projectContext);
-    if (fs::exists(kleeOutDir)) {
-        FileSystemUtils::removeAll(kleeOutDir);
-    }
+//    if (fs::exists(kleeOutDir)) {
+//        FileSystemUtils::removeAll(kleeOutDir);
+//    }
     fs::create_directories(kleeOutDir);
     CollectionUtils::MapFileTo<std::vector<TestMethod>> fileToMethods;
     for (const auto &method : testMethods) {
@@ -219,9 +219,9 @@ KleeRunner::createKleeParams(const tests::TestMethod &testMethod,
 
     std::vector<std::string> argvData = {
         "klee",
-        "--entry-point=" + KleeUtils::entryPointFunction(tests, testMethod.methodName, true),
+        "--entry-points=" + KleeUtils::entryPointFunction(tests, testMethod.methodName, true),
         "--libc=klee",
-        "--utbot",
+//        "--utbot",
         "--posix-runtime",
         "--skip-not-lazy-initialized",
         "--min-number-elements-li=1",

server/src/Server.cpp

@@ -312,7 +312,8 @@ Status Server::TestsGenServiceImpl::ProcessBaseTestRequest(BaseTestGen &testGen,
                                fetcher.getStructsToDeclare(), testGen.serverBuildDir, typesHandler)
                 .generateTestHeaders(testGen.tests, stubGen, selectedTargets, testGen.progressWriter);
         KleeRunner kleeRunner{testGen.projectContext, testGen.settingsContext};
-        bool interactiveMode = (dynamic_cast<ProjectTestGen *>(&testGen) != nullptr);
+//        bool interactiveMode = (dynamic_cast<ProjectTestGen *>(&testGen) != nullptr);
+        bool interactiveMode = false;
         auto generationStartTime = std::chrono::steady_clock::now();
         StatsUtils::TestsGenerationStatsFileMap generationStatsMap(testGen.projectContext,
                                                                    std::chrono::duration_cast<std::chrono::milliseconds>(

submodules/build-klee.sh

@@ -21,13 +21,16 @@ $UTBOT_CMAKE_BINARY -G Ninja \
   -DENABLE_SYSTEM_TESTS=TRUE \
   -DGTEST_SRC_DIR=$UTBOT_ALL/gtest \
   -DGTEST_INCLUDE_DIR=$UTBOT_ALL/gtest/googletest/include \
+  -DJSON_SRC_DIR=$UTBOT_ALL/json \
+  -DIMMER_SRC_DIR=$UTBOT_ALL/immer \
   -DCMAKE_INSTALL_PREFIX=$UTBOT_ALL/klee \
   -DENABLE_KLEE_LIBCXX=TRUE \
   -DKLEE_LIBCXX_DIR=$UTBOT_ALL/libcxx/install \
   -DKLEE_LIBCXX_INCLUDE_DIR=$UTBOT_ALL/libcxx/install/include/c++/v1 \
   -DENABLE_KLEE_EH_CXX=TRUE \
   -DKLEE_LIBCXXABI_SRC_DIR=$UTBOT_ALL/libcxx/libcxxabi \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DWARNINGS_AS_ERRORS=OFF \
   ..
 
 $UTBOT_CMAKE_BINARY --build .