From 3de4a1f80e122765508f33281a7ee69a9c8d893d Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 21 Aug 2025 21:52:10 +0200 Subject: [PATCH 1/2] Convert STI tests to TMT (rhbz#2382901) --- .fmf/version | 1 + plans.fmf | 19 +++++++++++++++++++ tests/main.fmf | 10 ++++++++++ tests/run.sh | 4 ++-- tests/tests.yml | 24 ------------------------ 5 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..c195230 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,19 @@ +summary: Run all tests +discover: + how: fmf + dist-git-source: true + dist-git-merge: true +prepare: + - name: Disable installing everything from srpm + how: install + exclude: ".*" + - name: Install the main package + how: install + package: + - fprintd + - name: "%prep requires git" + how: install + package: + - git +execute: + how: tmt diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..ebe3556 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,10 @@ +/fprintd: + summary: Run fprintd.py + test: ./run.sh ./fprintd.py + require: + - python3-gobject-base + - python3-dbus + - python3-cairo + - dbus-daemon + - python3-dbusmock + duration: 10m diff --git a/tests/run.sh b/tests/run.sh index ffd03db..9a6f061 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -10,7 +10,7 @@ if [[ "$ID" = *"rhel"* ]] && [[ "$VERSION_ID" == *"8"* ]]; then fi # Switch into the tests directory -cd source/tests || exit 1 +cd ../fprintd-*/tests || exit 1 # Run actual test -exec python3 "$@" \ No newline at end of file +exec python3 "$@" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1a2a318..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-source - tags: - - always - required_packages: - - git - - role: standard-test-basic - tags: - - atomic - - classic - required_packages: - - fprintd - - python3-gobject-base - - python3-dbus - - python3-cairo - - dbus-daemon - - python3-dbusmock - tests: - - fprintd: - dir: . - run: run.sh ./fprintd.py - timeout: 10m From a3a25acdb28d13e551d7a0778fe1ca007ae51209 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 15 Dec 2025 12:13:15 -0500 Subject: [PATCH 2/2] Drop ExcludeArch for IBM Z to allow building there for COSMIC --- fprintd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fprintd.spec b/fprintd.spec index b76ab7c..183fadb 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -7,7 +7,6 @@ Summary: D-Bus service for Fingerprint reader access License: GPL-2.0-or-later AND GFDL-1.1-or-later Source0: https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v%{version}/fprintd-v%{version}.tar.gz Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd -ExcludeArch: s390 s390x BuildRequires: meson BuildRequires: gcc