Adapt STI tests to current meson

Meson now requires a build directory out of source tree.

Setting STI dir to "{{ tenv_workdir }}source" does not work. It
expands to "/var/str/var/str/source" instead of "var/str/source".
Hence this patch passes to meson an explicit path to the directory
with libmodulemd sources.
This commit is contained in:
Petr Písař 2023-05-10 17:16:59 +02:00
parent 8bdb2b1d1b
commit 27262aa7e1
2 changed files with 11 additions and 8 deletions

View File

@ -24,7 +24,7 @@
Name: %{upstream_name}%{?v2_suffix}
Version: 2.15.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Module metadata manipulation library
# COPYING: MIT
@ -181,6 +181,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \
%changelog
* Wed May 10 2023 Petr Pisar <ppisar@redhat.com> - 2.15.0-2
- Adapt STI tests to current meson
* Wed May 10 2023 Petr Pisar <ppisar@redhat.com> - 2.15.0-1
- 2.15.0 bump

View File

@ -1,17 +1,17 @@
---
- hosts: localhost
tags:
- classic
- classic
roles:
- role: standard-test-source
- hosts: localhost
tags:
- classic
- classic
tasks:
- name: Make sure fedpkg and selinux bindings are installed
shell: dnf -y install fedpkg python{2,3}-libselinux libmodulemd-devel --skip-broken
- name: Copy spec file to remote machine
- name: Copy a spec file to /tmp
copy:
src: "{{ playbook_dir }}/../libmodulemd.spec"
dest: /tmp/libmodulemd.spec
@ -24,9 +24,9 @@
roles:
- role: standard-test-basic
tests:
- configure:
run: meson setup -Daccept_overflowed_buildorder=true -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true /tmp/build "{{ tenv_workdir }}source"
- build:
dir: .
run: meson -Daccept_overflowed_buildorder=true -Drpmio=enabled -Dskip_introspection=false -Dtest_installed_lib=true -Dwith_py2=false -Dwith_py3=true source
run: ninja -C /tmp/build
- unittests:
dir: .
run: ninja test
run: meson test -C /tmp/build