Merge branch 'master' into debian-jessie-backports

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

diff --git a/t/meta.t b/t/meta.t
index ab25c2f83b1c29e3c7ece69e6704ebf95d330273..d23d9bc71a8f1ce7c19510ca492d4733635fb0fa 100755 (executable)
--- a/t/meta.t
+++ b/t/meta.t
@@ -8,10 +8,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 = qw(perl -I. ./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 {
@@ -125,12 +136,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 +159,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();