X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d42ed9bdc3e4c4875e6fcf2f5e5ffe71652a51ee..143569f449a4ccd1c80e1949baa964909438452d:/t/meta.t

diff --git a/t/meta.t b/t/meta.t
old mode 100644
new mode 100755
index ab25c2f83..63c01937f
--- a/t/meta.t
+++ b/t/meta.t
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
+use Cwd qw(getcwd);
 use Test::More;
 use IkiWiki;
 
@@ -8,10 +9,21 @@ my $tmp = 't/tmp';
 my $srcdir = "$tmp/in";
 my $destdir = "$tmp/out";
 
-my @command = (qw(./ikiwiki.out --plugin meta --disable-plugin htmlscrubber));
-push @command, qw(-underlaydir=underlays/basewiki);
-push @command, qw(-set underlaydirbase=underlays);
-push @command, qw(--templatedir=templates);
+my $installed = $ENV{INSTALLED_TESTS};
+
+my @command;
+if ($installed) {
+	@command = qw(ikiwiki);
+}
+else {
+	ok(! system("make -s ikiwiki.out"));
+	@command = ("perl", "-I".getcwd, qw(./ikiwiki.out
+		--underlaydir=underlays/basewiki
+		--set underlaydirbase=underlays
+		--templatedir=templates));
+}
+
+push @command, qw(--plugin meta --disable-plugin htmlscrubber);
 push @command, $srcdir, $destdir;
 
 sub write_build_read_compare {
@@ -53,12 +65,6 @@ write_build_read_compare(
 	qr{<div class="pagecopyright">},
 );
 
-write_build_read_compare(
-	'enclosure',
-	q{[[!meta enclosure="ikiwiki/login-selector/wordpress.png"]]},
-	qr{<meta name="enclosure" content="/ikiwiki/login-selector/wordpress.png" />},
-);
-
 write_build_read_compare(
 	'author',
 	q{[[!meta author="Noodly J. Appendage"]]},
@@ -125,12 +131,11 @@ write_build_read_compare(
 #	qr{<link href="http://wonka\.link\.example" />},
 #);
 
-# XXX buggy? is this my bug? maybe twitter:foo would just work if this worked
-#write_build_read_compare(
-#	'name',
-#	q{[[!meta name="thingy" value1="hi" value2="hello"]]},
-#	qr{<meta name="thingy" value1="hi" value2="hello" />},
-#);
+write_build_read_compare(
+	'name',
+	q{[[!meta name="thingy" value1="hi" value2="hello"]]},
+	qr{<meta name="thingy" value[0-9]{1}=".+?" value[0-9]{1}=".+?" />},
+);
 
 write_build_read_compare(
 	'keywords',
@@ -149,11 +154,11 @@ write_build_read_compare(
 #	'[[!meta twitter:card="player"]]',
 #	qr{<meta name="twitter:card" content="player" />},
 #);
-#
-#write_build_read_compare(
-#	'twittercard2',
-#	'[[!meta name="twitter:card" content="player"]]',
-#	qr{<meta name="twitter:card" content="player" />},
-#);
+
+write_build_read_compare(
+	'twittercard2',
+	'[[!meta name="twitter:card" content="player"]]',
+	qr{<meta name="twitter:card" content="player" />},
+);
 
 done_testing();