Merge branch 'master' of git://git.ikiwiki.info

[git.ikiwiki.info.git] / t / crazy-badass-perl-bug.t

diff --git a/t/crazy-badass-perl-bug.t b/t/crazy-badass-perl-bug.t
index 78f0b50112885d44e490925270058620f705c477..328a979c2a7158dbfa3d98ea3ea49f2405f71c80 100755 (executable)
--- a/t/crazy-badass-perl-bug.t
+++ b/t/crazy-badass-perl-bug.t
@@ -2,18 +2,19 @@
 # DO NOT CHANGE ANYTHING IN THIS FILE.
 # THe crazy bug reproduced here will go away if any of the calls
 # to htmlize are changed.
 # DO NOT CHANGE ANYTHING IN THIS FILE.
 # THe crazy bug reproduced here will go away if any of the calls
 # to htmlize are changed.

+# Note: This was http://bugs.debian.org/376329 , and was fixed in 
+# perl 5.14.

 use warnings;
 use strict;
 use warnings;
 use strict;

-use Test::More tests => 103;
+use Test::More tests => 102;

 use Encode;
 
 BEGIN { use_ok("IkiWiki"); }
 use Encode;
 
 BEGIN { use_ok("IkiWiki"); }

-BEGIN { use_ok("IkiWiki::Render"); }

 
 # Initialize htmlscrubber plugin
 
 # Initialize htmlscrubber plugin

-%IkiWiki::config=IkiWiki::defaultconfig();
-$IkiWiki::config{srcdir}=$IkiWiki::config{destdir}="/dev/null";
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";

 IkiWiki::loadplugins(); IkiWiki::checkconfig();
 IkiWiki::loadplugins(); IkiWiki::checkconfig();

-ok(IkiWiki::htmlize("foo", "mdwn", IkiWiki::readfile("t/test1.mdwn")));
-ok(IkiWiki::htmlize("foo", "mdwn", IkiWiki::readfile("t/test3.mdwn")),
+ok(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test1.mdwn")));
+ok(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test3.mdwn")),

        "wtf?") for 1..100;
        "wtf?") for 1..100;