fix warning + carp interaction

[p5sagit/p5-mst-13.2.git] / lib / warnings.t

diff --git a/lib/warnings.t b/lib/warnings.t
index c88a4d9..009dee0 100644 (file)
--- a/lib/warnings.t
+++ b/lib/warnings.t
@@ -119,18 +119,29 @@ for (@prgs){
     my $prefix = ($results =~ s#^PREFIX(\n|$)##) ;
     # any special options? (OPTIONS foo bar zap)
     my $option_regex = 0;
+    my $option_random = 0;
     if ($expected =~ s/^OPTIONS? (.+)\n//) {
        foreach my $option (split(' ', $1)) {
            if ($option eq 'regex') { # allow regular expressions
                $option_regex = 1;
-           } else {
+           } 
+           elsif ($option eq 'random') { # all lines match, but in any order
+               $option_random = 1;
+           }
+           else {
                die "$0: Unknown OPTION '$option'\n";
            }
        }
     }
+    die "$0: can't have OPTION regex and random\n"
+        if $option_regex + option_random > 1;
     if ( $results =~ s/^SKIPPED\n//) {
        print "$results\n" ;
     }
+    elsif ($option_random)
+    {
+        print "not " if !randomMatch($results, $expected);
+    }
     elsif (($prefix  && (( $option_regex && $results !~ /^$expected/) ||
                         (!$option_regex && $results !~ /^\Q$expected/))) or
           (!$prefix && (( $option_regex && $results !~ /^$expected/) ||
@@ -144,3 +155,15 @@ for (@prgs){
     foreach (@temps)
        { unlink $_ if $_ }
 }
+
+sub randomMatch
+{
+    my $got = shift ;
+    my $expected = shift;
+
+    my @got = sort split "\n", $got ;
+    my @expected = sort split "\n", $expected ;
+
+   return "@got" eq "@expected";
+
+}