Fix test suite to work with perl 5.18. Closes: #719969

diff --git a/debian/changelog b/debian/changelog
index 07ea0c3d808a8b2ad182a7b0b75f4bd231d20bb7..3692dcd427384808aeb3798cd2008ead739fec07 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20130712) UNRELEASED; urgency=low
   * Consistently configure LWP::UserAgent to allow use of http_proxy
     and no_proxy environment variables, as well as ~/.ikiwiki/cookies
     (schmonz)
+  * Fix test suite to work with perl 5.18. Closes: #719969
 
  -- Joey Hess <joeyh@debian.org>  Fri, 19 Jul 2013 18:53:23 -0400
 

diff --git a/t/po.t b/t/po.t
index 5e251fce469fa2ad36a874dee6a5d26db520fe93..0db56edc9efae236deeaf8b7348b4bc9e65bbcf9 100755 (executable)
--- a/t/po.t
+++ b/t/po.t
@@ -135,7 +135,7 @@ is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgp
 is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
-is_deeply(\@{$links{'nontranslatable'}}, ['/', 'translatable', 'translatable.fr', 'translatable.es'], "$msgprefix nontranslatable");
+is_deeply([sort @{$links{'nontranslatable'}}], [sort('/', 'translatable', 'translatable.fr', 'translatable.es')], "$msgprefix nontranslatable");
 
 $config{po_link_to}='current';
 $msgprefix="links (po_link_to=current)";
@@ -146,7 +146,7 @@ is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatabl
 is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable");
 is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es");
 is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr");
-is_deeply(\@{$links{'nontranslatable'}}, ['/', 'translatable', 'translatable.fr', 'translatable.es'], "$msgprefix nontranslatable");
+is_deeply([sort @{$links{'nontranslatable'}}], [sort('/', 'translatable', 'translatable.fr', 'translatable.es')], "$msgprefix nontranslatable");
 
 ### targetpage
 $config{usedirs}=0;