Skip to content

tests: Fix incorrect paths for test files #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbhtt merged 2 commits into from
Sep 8, 2025
Merged

tests: Fix incorrect paths for test files #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1c6057
tests: Fix incorrect paths for test files
bbhtt Sep 7, 2025
02e5609
ci: Build with installed tests enabled by default
bbhtt Sep 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ jobs:
CC: ${{ matrix.compiler }}
BASE_CFLAGS: -Wp,-D_FORTIFY_SOURCE=2
BUILDDIR: builddir
CONFIG_OPTS: -Dinstalled_tests=true

steps:
- name: Install Dependencies
Expand Down Expand Up @@ -141,7 +142,7 @@ jobs:
uses: actions/checkout@v4

- name: Configure flatpak-builder
run: meson setup --wrap-mode nodownload ${BUILDDIR} .
run: meson setup --wrap-mode nodownload ${CONFIG_OPTS} ${BUILDDIR} .

- name: Build flatpak-builder with Meson
run: meson compile -C ${BUILDDIR}
Expand All @@ -168,7 +169,7 @@ jobs:
installed-test-logs/

- name: Configure flatpak-builder with Meson wraps
run: meson setup --wrap-mode=forcefallback ${BUILDDIR}_wrap .
run: meson setup --wrap-mode=forcefallback ${CONFIG_OPTS} ${BUILDDIR}_wrap .

- name: Build flatpak-builder with Meson wraps
run: meson compile -C ${BUILDDIR}_wrap
6 changes: 3 additions & 3 deletions tests/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ if get_option('installed_tests')
'test-runtime.json',
'test.json',
'test.yaml',
'tests/org.flatpak_builder.gui.desktop',
'tests/org.flatpak_builder.gui.json',
'tests/org.flatpak_builder.gui.metainfo.xml',
'org.flatpak_builder.gui.desktop',
'org.flatpak_builder.gui.json',
'org.flatpak_builder.gui.metainfo.xml',

install_dir: installed_testdir,
install_mode: 'rw-r--r--',
Expand Down