Localising hash slices with UTF-8 encoded keys was also buggy.

[perl5.git] / t / harness

diff --git a/t/harness b/t/harness
index e3e02f5..f52c441 100644 (file)
--- a/t/harness
+++ b/t/harness
@@ -16,7 +16,7 @@ use Test::Harness;
 $Test::Harness::switches = "";    # Too much noise otherwise
 $Test::Harness::verbose = shift if @ARGV && $ARGV[0] eq '-v';
 
-if ($ARGV[0] eq '-torture') {
+if ($ARGV[0] && $ARGV[0] eq '-torture') {
     shift;
     $torture = 1;
 }
@@ -54,7 +54,7 @@ sub _populate_hash {
     return map {$_, 1} split /\s+/, $_[0];
 }
 
-if ($ARGV[0]=~/^-re/) {
+if ($ARGV[0] && $ARGV[0]=~/^-re/) {
     if ($ARGV[0]!~/=/) {
         shift;
         $re=join "|",@ARGV;
@@ -96,6 +96,7 @@ if (@ARGV) {
        my $updir = File::Spec->updir;
        my $mani  = File::Spec->catfile(File::Spec->updir, "MANIFEST");
        if (open(MANI, $mani)) {
+           my @manitests = ();
            while (<MANI>) { # similar code in t/TEST
                if (m!^(ext/(\S+)/+(?:[^/\s]+\.t|test\.pl)|lib/\S+?(?:\.t|test\.pl))\s!) {
                    my ($test, $extension) = ($1, $2);
@@ -104,10 +105,13 @@ if (@ARGV) {
                        # XXX Do I want to warn that I'm skipping these?
                        next if $skip{$extension};
                    }
-                   push @tests, File::Spec->catfile($updir, $test);
+                   push @manitests, File::Spec->catfile($updir, $test);
                }
            }
            close MANI;
+           # Sort the list of test files read from MANIFEST into a sensible
+           # order instead of using the order in which they are listed there
+           push @tests, sort { lc $a cmp lc $b } @manitests;
        } else {
            warn "$0: cannot open $mani: $!\n";
        }