From 241be60b596729f569829fa71b5c7c244e1d7f74 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Tue, 21 Sep 2021 20:11:58 +0200 Subject: [PATCH] Drop build dependency on screen, constrict %check Dependency on gnu screen unwelcome per #1962907. --- dejagnu.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dejagnu.spec b/dejagnu.spec index 465315b..d3dc332 100644 --- a/dejagnu.spec +++ b/dejagnu.spec @@ -10,7 +10,7 @@ Requires: expect BuildArch: noarch BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: expect screen texinfo +BuildRequires: expect texinfo BuildRequires: make %description @@ -29,13 +29,11 @@ into software development). %check echo ============TESTING=============== -# Dejagnu test suite also has to test reporting to user. It needs a -# terminal for that. That doesn't compute in mock. Work around it by -# running the test under screen and communicating back to test runner -# via temporary file. If you have better idea, we accept patches. TMP=`mktemp` export SCREENDIR=`mktemp -d` -screen -D -m sh -c '(make check RUNTESTFLAGS="RUNTEST=`pwd`/runtest"; echo $?) >> '$TMP +# Only do limited smoke check with selected testcases +# Failed testcases reported upstream +(make check RUNTESTFLAGS="--ignore pr48155.exp stats.exp"; echo $?) >> $TMP RESULT=`tail -n 1 $TMP` cat $TMP rm -f $TMP @@ -53,6 +51,7 @@ install -D -m 644 doc/dejagnu.info $RPM_BUILD_ROOT/%{_infodir}/%{name}.info %files %doc COPYING NEWS README AUTHORS ChangeLog doc/dejagnu.texi %{_bindir}/runtest +%{_bindir}/dejagnu %{_datadir}/dejagnu %{_includedir}/dejagnu.h %{_mandir}/*/*