urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

img test: skip testing PDFs if unsupported

master
Simon McVittie 2016-01-18 09:19:42 +00:00
parent 317d19842c
commit 5dceeb28d8
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -36,6 +36,7 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium
* d/control: Standards-Version: 3.9.6, no changes required
* Silence "used only once: possible typo" warnings for variables
that are part of modules' APIs
* img test: skip testing PDFs if unsupported
-- Simon McVittie <smcv@debian.org> Mon, 15 Jun 2015 18:13:23 +0100

4
doc/bugs/img_test_failure_on_nix.mdwn
View File

@ -27,3 +27,7 @@ Peter Simons wrote:
>>
>> If the result is `$VAR1 = [ undef ]`, then we can easily make the test skip that bit if PDFs don't work.
>> --[[smcv]]
>>> That configuration test doesn't actually work because of the way
>>> ImageMagick processes PDFs via ghostscript, but loading a sample
>>> PDF and probing its width does seem to work. [[done]] --[[smcv]]

29
t/img.t
View File

@ -38,6 +38,9 @@ push @command, qw(--set usedirs=0 --plugin img t/tmp/in t/tmp/out --verbose);
my $magick = new Image::Magick;
my $SVGS_WORK = defined $magick->QueryFormat("svg");
$magick->Read("t/img/twopages.pdf");
my $PDFS_WORK = defined $magick->Get("width");
ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in"));
ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png"));
@ -60,6 +63,14 @@ if ($SVGS_WORK) {
$maybe_svg_img = "[[!img emptysquare.svg size=10x]]";
}
my $maybe_pdf_img = "";
if ($PDFS_WORK) {
$maybe_pdf_img = <<EOF;
[[!img twopages.pdf size=12x]]
[[!img twopages.pdf size=16x pagenumber=1]]
EOF
}
writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
[[!img redsquare.png]]
[[!img redsquare.png size=10x]]
@ -68,8 +79,7 @@ writefile("imgconversions.mdwn", "t/tmp/in", <<EOF
[[!img a:b:c.png size=x4]]
[[!img a:b:c:d:e:f:g:h:i:j.png size=x6]]
$maybe_svg_img
[[!img twopages.pdf size=12x]]
[[!img twopages.pdf size=16x pagenumber=1]]
$maybe_pdf_img
EOF
);
ok(utime(333333333, 333333333, "t/tmp/in/imgconversions.mdwn"));
@ -93,13 +103,20 @@ is(size("$outpath/10x-redsquare.png"), "10x10");
ok(! -e "$outpath/30x-redsquare.png");
ok($outhtml =~ /width="30" height="30".*expecting 30x30/);
if ($SVGS_WORK) {
SKIP: {
skip "SVG support not installed (try libmagickcore-extra)", 1
unless $SVGS_WORK;
# if this fails, you need libmagickcore-6.q16-2-extra installed
is(size("$outpath/10x-emptysquare.png"), "10x10");
is(size("$outpath/10x-bluesquare.png"), "10x10");
}
SKIP: {
skip "PDF support not installed (try ghostscript)", 2
unless $PDFS_WORK;
is(size("$outpath/12x-twopages.png"), "12x12");
is(size("$outpath/16x-p1-twopages.png"), "16x2");
}
is(size("$outpath/12x-twopages.png"), "12x12");
is(size("$outpath/16x-p1-twopages.png"), "16x2");
ok($outhtml =~ /width="8" height="8".*expecting 8x8/);
is(size("$outpath/x8-hello:world.png"), "8x8");
is(size("$outpath/x4-a:b:c.png"), "4x4");