Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / t / img.t

diff --git a/t/img.t b/t/img.t
index 7e7753aab50d7934f8a5d901bd01848a16423b36..b73988b7caba703983e9b012212b06bc1ab01e54 100755 (executable)
--- a/t/img.t
+++ b/t/img.t
@@ -14,13 +14,33 @@ package IkiWiki;
 use warnings;
 use strict;
 use Test::More;
+plan(skip_all => "Image::Magick not available")
+       unless eval q{use Image::Magick; 1};
 
-BEGIN { use_ok("IkiWiki"); }
-BEGIN { use_ok("Image::Magick"); }
+use IkiWiki;
+
+my $installed = $ENV{INSTALLED_TESTS};
+
+my @command;
+if ($installed) {
+       @command = qw(ikiwiki);
+}
+else {
+       ok(! system("make -s ikiwiki.out"));
+       @command = qw(perl -I. ./ikiwiki.out
+               --underlaydir=underlays/basewiki
+               --set underlaydirbase=underlays
+               --templatedir=templates);
+}
+
+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"));
@@ -31,7 +51,7 @@ ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c:d.png"));
 ok(! system("cp t/img/redsquare.png t/tmp/in/a:b:c:d:e:f:g:h:i:j.png"));
 
 if ($SVGS_WORK) {
-       writefile("emptysquare.svg", "t/tmp/in",
+       writefile("bluesquare.svg", "t/tmp/in",
                '<svg width="30" height="30"><rect x="0" y="0" width="30" height="30" fill="blue"/></svg>');
 }
 
@@ -40,7 +60,15 @@ ok(! system("cp t/img/twopages.pdf t/tmp/in/twopages.pdf"));
 
 my $maybe_svg_img = "";
 if ($SVGS_WORK) {
-       $maybe_svg_img = "[[!img emptysquare.svg size=10x]]";
+       $maybe_svg_img = "[[!img bluesquare.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
@@ -51,16 +79,12 @@ 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"));
 
-ok(! system("make -s ikiwiki.out"));
-
-my $command = "perl -I. ./ikiwiki.out --set usedirs=0 --templatedir=templates --plugin img t/tmp/in t/tmp/out --verbose";
-
-ok(! system($command));
+ok(! system(@command));
 
 sub size($) {
        my $filename = shift;
@@ -79,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");
@@ -96,12 +127,12 @@ is(size("$outpath/x6-a:b:c:d:e:f:g:h:i:j.png"), "6x6");
 if (1) { # for easier testing
        writefile("imgconversions.mdwn", "t/tmp/in", "nothing to see here");
 
-       ok(! system("$command --refresh"));
+       ok(! system(@command, "--refresh"));
 
-       ok(! -e "$outpath/10x-simple.png");
-       ok(! -e "$outpath/10x-simple-svg.png");
-       ok(! -e "$outpath/10x-simple-pdf.png");
-       ok(! -e "$outpath/10x-p1-simple-pdf.png");
+       ok(! -e "$outpath/10x-redsquare.png");
+       ok(! -e "$outpath/10x-bluesquare.png");
+       ok(! -e "$outpath/12x-twopages.png");
+       ok(! -e "$outpath/16x-p1-twopages.png");
        ok(! -e "$outpath/x8-hello:world.png");
        ok(! -e "$outpath/x4-a:b:c.png");
        ok(! -e "$outpath/x6-a:b:c:d:e:f:g:h:i:j.png");