From 4958b0a7f10b2d9e74ebbdb3a3fb433abc9b0877 Mon Sep 17 00:00:00 2001 From: Bryan Bernhart Date: Fri, 8 Jul 2022 20:35:07 -0700 Subject: [PATCH] Fix trace index path for CTest builds. Add support for building through CMakelist #386 --- .vscode/settings.json.defaults | 7 ++++++- src/tests/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json.defaults b/.vscode/settings.json.defaults index 805d29d86..ef0434fa1 100644 --- a/.vscode/settings.json.defaults +++ b/.vscode/settings.json.defaults @@ -123,5 +123,10 @@ ".github/workflows/win_clang_rel_x64.yaml" ], "github-actions.workflows.pinned.refresh.enabled": true, - "github-actions.workflows.pinned.refresh.interval": 65 + "github-actions.workflows.pinned.refresh.interval": 65, + + // Allow GPGMM internal tests to build. + "cmake.configureArgs": [ + "-DBUILD_SHARED_LIBS:BOOL=FALSE" + ] } diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 8b2a4cee6..363577569 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -102,7 +102,7 @@ target_link_libraries(gpgmm_end2end_tests PRIVATE add_executable(gpgmm_capture_replay_tests) set(TRACE_INDEX_FILE_NAME "traces.json") -set(TRACE_INPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/capture_replay_tests/traces") +set(TRACE_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/capture_replay_tests/traces") set(TRACE_INDEX_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/${TRACE_INDEX_FILE_NAME}") add_custom_command(