From a186ff639424b2c79193c1d492ba5e7c434e2956 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 6 Sep 2026 16:51:56 +0000 Subject: [PATCH 1/2] build(deps): bump third-party/tray from `1d0d696` to `c329d9f` Bumps [third-party/tray](https://github.com/LizardByte/tray) from `1d0d696` to `c329d9f`. - [Release notes](https://github.com/LizardByte/tray/releases) - [Commits](https://github.com/LizardByte/tray/compare/1d0d69623fe7ddb3da180db4b99417f9497d4f79...c329d9fd0d39dfb47f0f2fb5467e1db2e8a1d623) --- updated-dependencies: - dependency-name: third-party/tray dependency-version: c329d9fd0d39dfb47f0f2fb5467e1db2e8a1d623 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- third-party/tray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party/tray b/third-party/tray index 1d0d69623fe..c329d9fd0d3 160000 --- a/third-party/tray +++ b/third-party/tray @@ -1 +1 @@ -Subproject commit 1d0d69623fe7ddb3da180db4b99417f9497d4f79 +Subproject commit c329d9fd0d39dfb47f0f2fb5467e1db2e8a1d623 From 6db9e41dd8f89c2bcee021cc58c5b49030d4a902 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 6 Sep 2026 13:07:15 -0400 Subject: [PATCH 2/2] test(tray): enable tray test hooks Gate `TRAY_ENABLE_TEST_HOOKS` behind `BUILD_TESTS` in dependency setup and propagate the same definition to test targets when tray tests are enabled. This keeps production tray builds unchanged while allowing tray-specific test hook code to be compiled consistently for supported platforms. --- cmake/dependencies/common.cmake | 4 ++++ tests/CMakeLists.txt | 3 +++ 2 files changed, 7 insertions(+) diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake index ba13f5cb365..b0ec16d34d9 100644 --- a/cmake/dependencies/common.cmake +++ b/cmake/dependencies/common.cmake @@ -56,6 +56,10 @@ if(SUNSHINE_ENABLE_TRAY) add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/tray") + if(BUILD_TESTS) + target_compile_definitions(tray PRIVATE TRAY_ENABLE_TEST_HOOKS) + endif() + if(SUNSHINE_USE_STATIC_QT) set(CMAKE_FIND_LIBRARY_SUFFIXES "${_sunshine_find_library_suffixes}") set(CMAKE_IMPORT_LIBRARY_SUFFIX "${_sunshine_import_library_suffix}") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f96e5afcb86..360ae84d022 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -74,6 +74,9 @@ set(TEST_DEFINITIONS) # list will be appended as needed list(APPEND TEST_DEFINITIONS SUNSHINE_TESTS) list(APPEND TEST_DEFINITIONS SUNSHINE_SOURCE_DIR="${CMAKE_SOURCE_DIR}") list(APPEND TEST_DEFINITIONS SUNSHINE_TEST_BIN_DIR="${CMAKE_CURRENT_BINARY_DIR}") +if(SUNSHINE_ENABLE_TRAY) + list(APPEND TEST_DEFINITIONS TRAY_ENABLE_TEST_HOOKS) +endif() # Override SUNSHINE_ASSETS_DIR to use a writable temp directory for tests # Remove the existing definition from SUNSHINE_DEFINITIONS to avoid redefinition error