ahill/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-26 14:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Tell "as-installed" tests where they can find triggers

Browse Source 
Since commit d10e1148 "Add initial support for preinstalling flatpaks",
the test suite sets FLATPAK_DATA_DIR to a temporary directory, both
while running uninstalled and as-installed.

While running uninstalled we already set FLATPAK_TRIGGERSDIR to the
trigger scripts in the source tree, but when running "as-installed",
we need to run the triggers that the OS installs as part of the flatpak
package (or equivalent).

Not having this caused autopkgtests (automated as-installed tests) in
Debian to regress with 1.17.x.

Fixes: d10e1148 "Add initial support for preinstalling flatpaks"
Signed-off-by: Simon McVittie <smcv@debian.org>
This commit is contained in:
Simon McVittie 2025-12-17 14:30:24 +00:00 committed by Sebastian Wick
parent 56dfd306d6
commit c324778b07
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/installed-tests.sh.in
View File

@ -1,4 +1,7 @@
# Copyright 2024 Collabora Ltd.
# SPDX-License-Identifier: LGPL-2.1-or-later
FLATPAK_TRIGGERSDIR='@FLATPAK_TRIGGERSDIR@'
FUSERMOUNT='@FUSERMOUNT@'
export FLATPAK_TRIGGERSDIR

1
tests/meson.build
View File

@ -46,6 +46,7 @@ if get_option('installed_tests')
output : 'installed-tests.sh',
configuration : {
'FUSERMOUNT' : fusermount,
'FLATPAK_TRIGGERSDIR' : get_option('prefix') / get_option('datadir') / 'flatpak' / 'triggers',
},
install_dir : installed_testdir,
)