From d92e8e6b929ad3547a231ca4e810140b6fdfe77c Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Wed, 7 Aug 2024 19:11:47 +0300 Subject: [PATCH] Update KLEE --- server/src/KleeRunner.cpp | 10 +++++----- server/src/Server.cpp | 3 ++- submodules/klee | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/src/KleeRunner.cpp b/server/src/KleeRunner.cpp index ad82bc84..7c6eed23 100644 --- a/server/src/KleeRunner.cpp +++ b/server/src/KleeRunner.cpp @@ -58,9 +58,9 @@ void KleeRunner::runKlee(const std::vector &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> fileToMethods; for (const auto &method : testMethods) { @@ -219,9 +219,9 @@ KleeRunner::createKleeParams(const tests::TestMethod &testMethod, std::vector 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", diff --git a/server/src/Server.cpp b/server/src/Server.cpp index 960e43d1..40c4e4d1 100644 --- a/server/src/Server.cpp +++ b/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(&testGen) != nullptr); +// bool interactiveMode = (dynamic_cast(&testGen) != nullptr); + bool interactiveMode = false; auto generationStartTime = std::chrono::steady_clock::now(); StatsUtils::TestsGenerationStatsFileMap generationStatsMap(testGen.projectContext, std::chrono::duration_cast( diff --git a/submodules/klee b/submodules/klee index f4316c59..d572f454 160000 --- a/submodules/klee +++ b/submodules/klee @@ -1 +1 @@ -Subproject commit f4316c595c003e7c11f7a678330b6e111b4ba36f +Subproject commit d572f454f7664df29affbaa5a08c896f4094ef99