diff --git a/gating.yaml b/gating.yaml index 648918d..d070991 100644 --- a/gating.yaml +++ b/gating.yaml @@ -3,4 +3,4 @@ product_versions: - rhel-9 decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tests.functional} diff --git a/libverto-tests b/libverto-tests new file mode 100755 index 0000000..5fc65aa --- /dev/null +++ b/libverto-tests @@ -0,0 +1,29 @@ +#!/bin/sh -eux + +export RPM_PACKAGE_NAME={{ name }} +export RPM_PACKAGE_VERSION={{ version }} +export RPM_PACKAGE_RELEASE={{ release }} +export RPM_ARCH={{ arch }} +export RPM_BUILD_NCPUS="$(getconf _NPROCESSORS_ONLN)" + +testdir="$(mktemp -d)" + +# Will remove the temporary test directory when the script terminates +# (even if stopped by an exit signal) +trap "rm -rf ${testdir}" EXIT + +build_flags="$(eval "echo $(rpm --eval '%{_smp_mflags}')")" + +mkdir "${testdir}/{{ name }}-tests" +cp -rp /usr/share/{{ name }}-tests/{{ arch }} "${testdir}/{{ name }}-tests/" + +autoreconf -fiv "${testdir}/{{ name }}-tests/{{ arch }}" + +mkdir -p "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs" +ln -s {{ libdir }}/libverto.so "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/" +ln -s {{ libdir }}/libverto.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/" +ln -s {{ libdir }}/libverto-glib.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/" +ln -s {{ libdir }}/libverto-libev.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/" +ln -s {{ libdir }}/libverto-libevent.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/" + +make -C "${testdir}/{{ name }}-tests/{{ arch }}/tests/" $build_flags check-TESTS diff --git a/libverto.spec b/libverto.spec index aa2f810..90a909e 100644 --- a/libverto.spec +++ b/libverto.spec @@ -2,23 +2,29 @@ Name: libverto Version: 0.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Main loop abstraction library License: MIT URL: %{homepage} Source0: %{homepage}/releases/download/%{version}/%{name}-%{version}.tar.gz +Source1: %{name}-tests -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: make +%global common_dependencies() %{expand: +%1: autoconf +%1: automake +%1: libtool +%1: gcc +%1: make +%1: redhat-rpm-config +} -BuildRequires: glib2-devel -BuildRequires: libevent-devel -BuildRequires: libev-devel +%{common_dependencies BuildRequires} -BuildRequires: git +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: libevent-devel +BuildRequires: libev-devel Obsoletes: libverto-tevent < 0.3.0-2 Obsoletes: libverto-tevent-devel < 0.3.0-2 @@ -103,6 +109,20 @@ developing applications that use %{name}-libev. This package provides %{name}-module-base since it supports io, timeout and signal. +%package tests +Summary: Test sources for %{name} build + +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-glib%{?_isa} = %{version}-%{release} +Requires: %{name}-libev%{?_isa} = %{version}-%{release} +Requires: %{name}-libevent%{?_isa} = %{version}-%{release} + +%{common_dependencies Requires} + +%description tests +FOR TESTING PURPOSE ONLY +Test sources for %{name} build, with pre-defined compilation parameters + %prep %autosetup -S git @@ -121,6 +141,22 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %ldconfig_scriptlets libevent %ldconfig_scriptlets libev +# Generate tests launching script +sed -e 's|{{ name }}|%{name}|g' \ + -e 's|{{ version }}|%{version}|g' \ + -e 's|{{ release }}|%{release}|g' \ + -e 's|{{ libdir }}|%{_libdir}|g' \ + -e 's|{{ arch }}|%{_arch}|g' \ + -i %{SOURCE1} +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} +install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-tests-%{_arch} + +# Copy files from build folder to system data folder +make mostlyclean +rm -rf .git .gitignore src/.libs +install -pdm 755 $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch} +cp -r * $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/ + %files %{!?_licensedir:%global license %%doc} %license COPYING @@ -157,7 +193,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/%{name}-libev.so %{_libdir}/pkgconfig/%{name}-libev.pc +%files tests +%{_libexecdir}/%{name}-tests-%{_arch} +%{_datarootdir}/%{name}-tests/%{_arch} + %changelog +* Fri Mar 21 2025 Julien Rische - 0.3.2-4 +- Add dedicated tests sub-package + * Mon Aug 09 2021 Mohan Boddu - 0.3.2-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/plan.fmf b/plans/tests.fmf similarity index 73% rename from plan.fmf rename to plans/tests.fmf index 0392cd5..970ae2e 100644 --- a/plan.fmf +++ b/plans/tests.fmf @@ -1,3 +1,4 @@ +summary: Tests discover: how: fmf execute: diff --git a/tests/driver/main.fmf b/tests/driver/main.fmf index 9fdcc1b..09283fc 100644 --- a/tests/driver/main.fmf +++ b/tests/driver/main.fmf @@ -3,16 +3,7 @@ contact: Anuja More component: - libverto require: -- libverto -- libverto-devel -- libverto-glib-devel -- libverto-libevent-devel -- make -- rpm-build -- fmf -- wget -- autoconf -- autoconf-archive +- libverto-tests test: ./runtest.sh duration: 25m enabled: true diff --git a/tests/driver/runtest.sh b/tests/driver/runtest.sh index c40a6c1..fb433db 100755 --- a/tests/driver/runtest.sh +++ b/tests/driver/runtest.sh @@ -1,29 +1,7 @@ -#!/bin/sh -ex - -dnf -y --nogpgcheck build-dep ../../libverto.spec - -wget https://github.com/latchset/libverto/releases/download/0.3.2/libverto-0.3.2.tar.gz -tar -xvzf libverto-0.3.2.tar.gz -cd libverto-0.3.2 - -# Generate Makefiles, directory layout, ... -autoreconf -fiv -./configure --with-glib --with-libevent --disable-dependency-tracking -make -sj - -# Avoid running `make check` here -cd tests -ls *.c | while read f; do - f="$(echo $f | awk -F. '{print $1}')" - make $f +#!/bin/sh -eux +rc=0 +for test_exec in /usr/libexec/libverto-tests-* +do + "$test_exec" || rc=1 done -cd .. - -# Overwrite the build. -cd src/.libs -cp /usr/lib64/libverto-glib.so.1.0.0 . -cp /usr/lib64/libverto-libevent.so.1.0.0 . -cd ../.. - -# Go time. -exec make check +exit $rc