From 526a463ae55b36d9713212861c674bc4ccb4b263 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 15 Sep 2014 23:02:47 +0100 Subject: [PATCH 1/1] img test: skip SVG tests if unsupported by Image::Magick --- t/img.t | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/t/img.t b/t/img.t index 95d39bc09..8c10d9b74 100755 --- a/t/img.t +++ b/t/img.t @@ -18,18 +18,30 @@ use Test::More; BEGIN { use_ok("IkiWiki"); } BEGIN { use_ok("Image::Magick"); } +my $magick = new Image::Magick; +my $SVGS_WORK = defined $magick->QueryFormat("svg"); + ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in")); ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png")); -writefile("emptysquare.svg", "t/tmp/in", ''); + +if ($SVGS_WORK) { + writefile("emptysquare.svg", "t/tmp/in", ''); +} + # using different image sizes for different pages, so the pagenumber selection can be tested easily 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]]"; +} + writefile("imgconversions.mdwn", "t/tmp/in", <