From: Lukas Mai <l.mai@web.de>
Date: Tue, 5 Feb 2013 00:57:40 +0000 (+0100)
Subject: Merge branch 'master' into metadata
X-Git-Tag: v1.0101~3^2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b9c12f70b2c7b73970cefbb5b41982ef22477ace;hp=5e074131c84a5e52e7d8da01c16d2ac1cf303621;p=p5sagit%2FFunction-Parameters.git

Merge branch 'master' into metadata
---

diff --git a/Changes b/Changes
index ab7cda0..600289f 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Function-Parameters
 
+1.0004  2012-11-26
+        - fix test relying on hash ordering
+
 1.0003  2012-11-19
         - clean up internals
         - fix build errors on some platforms
diff --git a/GNUmakefile b/GNUmakefile
index 02cadbc..653125c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,7 @@ CCFLAGS := -DDEVEL $(CCFLAGS)
 .PHONY: multitest
 multitest:
 	f=''; \
-	for i in ~/perl5/perlbrew/perls/perl-5.1[468]*/bin/perl perl; do \
+	for i in "$$PERLBREW_ROOT"/perls/*5.1[468]*/bin/perl perl; do \
 	    echo "Trying $$i ..."; \
 	    $$i Makefile.PL && make && make test; \
 	    [ $$? = 0 ] || f="$$f $$i"; \
diff --git a/lib/Function/Parameters.pm b/lib/Function/Parameters.pm
index 62db745..a3afc55 100644
--- a/lib/Function/Parameters.pm
+++ b/lib/Function/Parameters.pm
@@ -8,7 +8,7 @@ use Carp qw(confess);
 
 use XSLoader;
 BEGIN {
-	our $VERSION = '1.0003';
+	our $VERSION = '1.0004';
 	XSLoader::load;
 }
 
diff --git a/t/foreign/MooseX-Method-Signatures/list.t b/t/foreign/MooseX-Method-Signatures/list.t
index 7309114..9699590 100644
--- a/t/foreign/MooseX-Method-Signatures/list.t
+++ b/t/foreign/MooseX-Method-Signatures/list.t
@@ -13,7 +13,7 @@ my $o = bless {} => 'Foo';
             return join q{,}, @rest;
         },
         method ($foo, $bar, %rest) {
-            return join q{,}, map { $_ => $rest{$_} } keys %rest;
+            return join q{,}, map { $_ => $rest{$_} } sort keys %rest;
         },
     );