aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2009-01-17 14:01:53 +0100
committerintrigeri <intrigeri@boum.org>2009-01-17 14:01:53 +0100
commit832d4d31d177d5d5f848250496048a00e9d70e2f (patch)
tree5fcda7f65be83ba15ae1ca321f77962bf3efd015 /t
parent40de619d4968ecd7dc0086ca5118746bc3db3860 (diff)
parent9e3bca852f9a39c43b4a7309b93ba9b0857ac4b9 (diff)
downloadikiwiki-832d4d31d177d5d5f848250496048a00e9d70e2f.tar
ikiwiki-832d4d31d177d5d5f848250496048a00e9d70e2f.tar.gz
Merge commit 'upstream/master' into prv/po
Conflicts: IkiWiki/Plugin/editpage.pm IkiWiki/Plugin/skeleton.pm.example doc/plugins/write.mdwn t/syntax.t
Diffstat (limited to 't')
-rwxr-xr-xt/syntax.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/syntax.t b/t/syntax.t
index 8c96d1d84..ddb0da073 100755
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -5,8 +5,8 @@ use Test::More;
my @progs="ikiwiki.in";
my @libs="IkiWiki.pm";
-# monotone, external, amazon_s3 skipped since they need perl modules
-push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v amazon_s3.pm | grep -v po.pm`;
+# monotone, external, blogspam, amazon_s3, po skipped since they need perl modules
+push @libs, map { chomp; $_ } `find IkiWiki -type f -name \\*.pm | grep -v monotone.pm | grep -v external.pm | grep -v blogspam.pm | grep -v amazon_s3.pm | grep -v po.pm`;
push @libs, 'IkiWiki/Plugin/skeleton.pm.example';
plan(tests => (@progs + @libs));