X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/82537ecf19e57d2a4b096bcc51180df0a0cf6ad7..f27d7b7a598597feea9fb2932807f4fdd0dc325e:/t/map.t

diff --git a/t/map.t b/t/map.t
index 4c8e5ede6..5d4713d6f 100755
--- a/t/map.t
+++ b/t/map.t
@@ -3,9 +3,16 @@ package IkiWiki;
 
 use warnings;
 use strict;
-use XML::Twig;
 use Test::More;
 
+BEGIN {
+        unless (eval { require XML::Twig }) {
+                eval q{
+                        use Test::More skip_all => "XML::Twig is not available"
+                }
+        }
+}
+
 BEGIN { use_ok("IkiWiki"); }
 BEGIN { use_ok("IkiWiki::Render"); }
 BEGIN { use_ok("IkiWiki::Plugin::map"); }
@@ -56,6 +63,12 @@ foreach my $page (@pages) {
 	writefile("$page.mdwn", "t/tmp", "your ad here");
 }
 
+sub comment {
+	my $str = shift;
+	$str =~ s/^/# /gm;
+	print $str;
+}
+
 sub node {
 	my $name = shift;
 	my $kids = shift;
@@ -105,13 +118,14 @@ sub check_nodes {
 sub check {
 	my $pagespec = shift;
 	my $expected = shift;
-	print "*** $pagespec ***\n";
+	comment("*** $pagespec ***\n");
 
 	my $html = IkiWiki::Plugin::map::preprocess(pages => $pagespec,
 		page => 'map',
 		destpage => 'map');
+	comment($html);
 	my $tree = XML::Twig->new(pretty_print => 'indented');
-	eval { 
+	eval {
 		$tree->parse($html);
 	};
 	if ($@) {
@@ -131,7 +145,6 @@ sub check {
 	}
 
 	$tree->dispose;
-	print "<!-- -->\n";
 }
 
 check('doesnotexist', []);
@@ -223,6 +236,7 @@ check('alpha/1/i*',
 		node('iv', []),
 	]);
 
+ok(! system("rm -rf t/tmp"));
 done_testing;
 
 1;