Skip to content

Commit

Permalink
Fix tooling settings (#449)
Browse files Browse the repository at this point in the history
Fix output directory paths for cmake and the cpputest vscode plugin.
  • Loading branch information
MedadRufus authored Aug 6, 2022
1 parent 5fca410 commit 9a82256
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cpputest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Test
working-directory: ${{github.workspace}}/build
run: ctest -C ${{env.BUILD_TYPE}}
run: ctest -C ${{env.BUILD_TYPE}} --rerun-failed --output-on-failure
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Place your settings in this file to overwrite default and user settings.
{
"cpputestExplorer.testExecutable": "${workspaceFolder}/build/tests/picotracker_lora_tests",
"cpputestExplorer.testExecutablePath": "${workspaceFolder}/build/tests"
"cpputestExplorer.testExecutable": "${workspaceFolder}/build/tests/tests/picotracker_lora_tests",
"cpputestExplorer.testExecutablePath": "${workspaceFolder}/build/tests/tests"
}
3 changes: 2 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"name": "common_configs",
"displayName": "common_configs",
"description": "Default Configurations for LoRaMAC node",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"APPLICATION": "LoRaMac",
Expand Down Expand Up @@ -39,6 +38,7 @@
"name": "unittesting_configs",
"description": "Configurations for unittesting",
"displayName": "unittesting_configs",
"binaryDir": "${sourceDir}/build/tests",
"inherits": [
"common_configs"
],
Expand All @@ -50,6 +50,7 @@
"name": "on_target_configs",
"description": "Configurations for building for target: STM32L072",
"displayName": "on_target_configs",
"binaryDir": "${sourceDir}/build",
"inherits": [
"common_configs"
],
Expand Down

0 comments on commit 9a82256

Please sign in to comment.