Skip to content

Commit

Permalink
Test: Add extra options to the integration tests to work with User co…
Browse files Browse the repository at this point in the history
…nfig

If the developper starts the integration tests debug configuration, the
configuration will be merged with his user configuration. This commit
resets the other bitbake configurations to prevent conflicts.
  • Loading branch information
deribaucourt committed May 31, 2024
1 parent 20b010e commit b2a32de
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions client/src/language/languageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export async function activateLanguageServer (context: ExtensionContext, bitBake
try {
await client.sendNotification('workspace/didChangeConfiguration', { settings })
} catch (error) {
logger.error(`Failed to send settings to language server: ${error}`)
logger.error('Failed to send settings to language server: ' + String(error))
}
}

Expand Down Expand Up @@ -183,7 +183,7 @@ export async function getScanResult<
logger.debug(`[getScanResult] (${methodName}): ${JSON.stringify(params)}, ${JSON.stringify(value)}`)
return value ?? undefined
} catch (error) {
logger.error(`Failed to get scan result: ${error}`)
logger.error(`Failed to get scan result: ${String(error)}`)
}
}

Expand Down
6 changes: 5 additions & 1 deletion integration-tests/project-folder/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
"files.trimTrailingWhitespace": false
},
"files.associations": {
"*.txt": "diff",
"*.conf": "bitbake",
"*.inc": "bitbake"
}
},
"bitbake.buildConfigurations": [],
"bitbake.commandWrapper": "",
"bitbake.workingDirectory": "${workspaceFolder}"
}

0 comments on commit b2a32de

Please sign in to comment.