Enable X11 tests

This commit is contained in:
Petr Písař 2014-09-12 15:06:54 +02:00
parent ac137c1229
commit 4f1ab03e14

View File

@ -1,6 +1,8 @@
%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)} %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
%define perlver %(eval "`%{__perl} -V:version`"; echo $version) %define perlver %(eval "`%{__perl} -V:version`"; echo $version)
%global use_x11_tests 1
Name: perl-Tk Name: perl-Tk
# devel version fix for perl 5.14: # devel version fix for perl 5.14:
Version: 804.032 Version: 804.032
@ -39,6 +41,14 @@ BuildRequires: perl(Config)
BuildRequires: perl(Cwd) BuildRequires: perl(Cwd)
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(lib) BuildRequires: perl(lib)
%if %{use_x11_tests}
# X11 tests:
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-xinit
BuildRequires: font(:lang=en)
# Specific font is needed for tests, bug #1141117, CPAN RT#98831
BuildRequires: liberation-sans-fonts
%endif
Requires: perl(:MODULE_COMPAT_%{perlver}) Requires: perl(:MODULE_COMPAT_%{perlver})
Provides: perl(Tk::LabRadio) = 4.004 Provides: perl(Tk::LabRadio) = 4.004
@ -104,9 +114,10 @@ chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm
find . -name Makefile | xargs %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' find . -name Makefile | xargs %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/'
make %{?_smp_mflags} make %{?_smp_mflags}
# disable because they need an x screen
%check %check
# make test %if %{use_x11_tests}
xvfb-run -a make test
%endif
%install %install
make pure_install DESTDIR=$RPM_BUILD_ROOT make pure_install DESTDIR=$RPM_BUILD_ROOT
@ -147,6 +158,7 @@ find __demos/ -type f -exec chmod -x {} \;
* Fri Sep 12 2014 Petr Pisar <ppisar@redhat.com> - 804.032-4 * Fri Sep 12 2014 Petr Pisar <ppisar@redhat.com> - 804.032-4
- Fix freetype detection - Fix freetype detection
- Fix creating a window with perl 5.20 (bug #1141117) - Fix creating a window with perl 5.20 (bug #1141117)
- Enable X11 tests
* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 804.032-3 * Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 804.032-3
- Perl 5.20 rebuild - Perl 5.20 rebuild