Skip to content

Commit 934bac4

Browse files
committed
Changes for running UTbotCpp on libbpf and curl projects.
1 parent b2daf60 commit 934bac4

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

server/src/building/ProjectBuildDatabse.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,19 @@ void ProjectBuildDatabase::initInfo(const nlohmann::json &linkCommandsJson) {
176176
}
177177
targetInfo->addFile(currentFile);
178178
if (Paths::isObjectFile(currentFile)) {
179-
if (!CollectionUtils::containsKey(objectFileInfos, currentFile)) {
179+
if (!CollectionUtils::containsKey(objectFileInfos, currentFile) &&
180+
!CollectionUtils::containsKey(objectFileInfos,
181+
relative(currentFile, directory))) {
180182
throw CompilationDatabaseException(
181-
"compile_commands.json doesn't contain a command for object file "
182-
+ currentFile.string());
183+
"compile_commands.json doesn't contain a command for object file " +
184+
currentFile.string());
185+
}
186+
if (CollectionUtils::containsKey(objectFileInfos, currentFile)) {
187+
objectFileInfos[currentFile]->linkUnit = output;
188+
} else if (CollectionUtils::containsKey(objectFileInfos,
189+
relative(currentFile, directory))) {
190+
objectFileInfos[relative(currentFile, directory)]->linkUnit = output;
183191
}
184-
objectFileInfos[currentFile]->linkUnit = output;
185192
}
186193
}
187194
targetInfo->commands.emplace_back(command);

server/src/utils/CompilationUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ namespace CompilationUtils {
9696
}
9797
}
9898

99-
StringUtils::replaceAll(directoryField, userSystemProjectPath, projectPathStr);
99+
// StringUtils::replaceAll(directoryField, userSystemProjectPath, projectPathStr);
100100
cmd[directoryFieldName] = directoryField;
101101

102102
if (cmd.contains(fileFieldName)) {

0 commit comments

Comments
 (0)