Skip to content

Update KLEE, fix small bugs #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2022
Merged

Update KLEE, fix small bugs #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/Server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion server/src/building/Linker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 1 addition & 7 deletions server/test/framework/Syntax_Tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
})
);
Expand Down Expand Up @@ -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;
},
Expand Down
2 changes: 1 addition & 1 deletion submodules/klee
Open in desktop
Submodule klee updated 12 files
+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