pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- do not run tests on i586 at all

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=350
This commit is contained in:
Petr Gajdos 2018-04-04 13:44:59 +00:00 committed by Git OBS Bridge
parent 49c1614aa3
commit 7d5559d7a1
3 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ImageMagick-tests.tap-attributes.patch Normal file
View File

@ -0,0 +1,21 @@
Index: ImageMagick-7.0.7-28/Magick++/tests/tests.tap
===================================================================
--- ImageMagick-7.0.7-28.orig/Magick++/tests/tests.tap 2018-03-25 20:18:56.000000000 +0200
+++ ImageMagick-7.0.7-28/Magick++/tests/tests.tap 2018-04-04 15:07:22.292261487 +0200
@@ -8,14 +8,14 @@
#
subdir=Magick++/tests
. ./common.shi
-echo "1..13"
+echo "1..12"
SRCDIR=${top_srcdir}/${subdir}/
export SRCDIR
cd ${subdir} || exit 1
-for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages
+for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages
do
./${mytest} && echo "ok" || echo "not ok"
done

5
ImageMagick.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 4 13:43:58 UTC 2018 - pgajdos@suse.com
- do not run tests on i586 at all
-------------------------------------------------------------------
Mon Mar 26 08:47:41 UTC 2018 - pgajdos@suse.com

22
ImageMagick.spec
View File

@ -48,7 +48,12 @@ Patch2: ImageMagick-library-installable-in-parallel.patch
#%%ifarch s390x s390 ppc64 ppc
Patch3: ImageMagick-s390-disable-tests.patch
#%%endif
# https://github.com/ImageMagick/ImageMagick/issues/1058
Patch4: ImageMagick-write.t-pict.patch
# https://github.com/ImageMagick/ImageMagick/issues/1019
#%%ifarch i586
Patch5: ImageMagick-tests.tap-attributes.patch
#%%endif
BuildRequires: chrpath
BuildRequires: dcraw
%if 0%{?suse_version} >= 1315
@ -299,6 +304,9 @@ HTML documentation for ImageMagick library and scene examples.
%patch3 -p1
%endif
%patch4 -p1
%ifarch i586
%patch5 -p1
%endif
%build
# make library binary package parallel installable
@ -347,17 +355,19 @@ dos2unix www/api/*.php
chmod -x PerlMagick/demo/*.pl
%check
%ifarch i586
# do not run tests on i586 at all
# https://github.com/ImageMagick/ImageMagick/issues/1059
# https://github.com/ImageMagick/ImageMagick/issues/1019
exit 0
# https://github.com/ImageMagick/ImageMagick/issues/1059
rm PerlMagick/t/montage.t
%endif
make %{?_smp_mflags} check
export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs
export MAGICK_CODER_FILTER_PATH=$PWD/filters/.libs
export MAGICK_CONFIGURE_PATH=$PWD/config
cd PerlMagick
%ifarch i586
# TODO test is failing completely (19/19), wrong
# checksums
# https://github.com/ImageMagick/ImageMagick/issues/1059
rm t/montage.t
%endif
%if 0%{?suse_version} >= 1315
make %{?_smp_mflags} test
%else