Update structure of img test from master

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

diff --git a/t/html.t b/t/html.t
index 01f14d0c0fbf0dfee414b56ebe8e9d78c2f8a519..84c561fa87e380ca63c6cf902e0f87192f5892c5 100755 (executable)
--- a/t/html.t
+++ b/t/html.t
@@ -6,15 +6,14 @@ use Test::More;
 my @pages;
 
 BEGIN {
-       @pages=qw(index todo features news plugins/map);
-       if (! -x "/usr/bin/validate") {
-               plan skip_all => "/usr/bin/validate html validator not present";
+       @pages=qw(index features news plugins/map security);
+       if (system("command -v validate >/dev/null") != 0) {
+               plan skip_all => "html validator not present";
        }
        else {
-               plan(tests => int @pages + 3);
+               plan(tests => int @pages + 2);
        }
        use_ok("IkiWiki");
-       use_ok("IkiWiki::Render");
 }
 
 # Have to build the html pages first.