Upgrade to Test::Harness 3.14

[p5sagit/p5-mst-13.2.git] / ext / Test / Harness / t / compat / test-harness-compat.t

diff --git a/ext/Test/Harness/t/compat/test-harness-compat.t b/ext/Test/Harness/t/compat/test-harness-compat.t
index 480d6d8..00fab13 100644 (file)
--- a/ext/Test/Harness/t/compat/test-harness-compat.t
+++ b/ext/Test/Harness/t/compat/test-harness-compat.t
@@ -1,33 +1,35 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-    if ($ENV{PERL_CORE}) {
-       # FIXME
-       print "1..0 # Skip until we figure out why it exists with no output just after the plan\n";
-       exit 0;
+    if ( $ENV{PERL_CORE} ) {
+        chdir 't';
+        @INC = '../lib';
+    }
+    else {
+        unshift @INC, 't/lib';
     }
 }
 
 use strict;
 
-use lib 't/lib';
+# use lib 't/lib';
 
 use Test::More;
-
 use File::Spec;
-
 use Test::Harness qw(execute_tests);
 
 # unset this global when self-testing ('testcover' and etc issue)
 local $ENV{HARNESS_PERL_SWITCHES};
 
+my $TEST_DIR
+  = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/sample-tests' : 't/sample-tests';
+
 {
 
     # if the harness wants to save the resulting TAP we shouldn't
     # do it for our internal calls
     local $ENV{PERL_TEST_HARNESS_DUMP_TAP} = 0;
 
-    my $TEST_DIR = 't/sample-tests';
     my $PER_LOOP = 4;
 
     my $results = {
@@ -58,110 +60,110 @@ local $ENV{HARNESS_PERL_SWITCHES};
               )
           ) => {
             'failed' => {
-                't/sample-tests/die' => {
+                "$TEST_DIR/die" => {
                     'canon'  => '??',
                     'estat'  => 1,
                     'failed' => '??',
                     'max'    => '??',
-                    'name'   => 't/sample-tests/die',
+                    'name'   => "$TEST_DIR/die",
                     'wstat'  => '256'
                 },
-                't/sample-tests/die_head_end' => {
+                "$TEST_DIR/die_head_end" => {
                     'canon'  => '??',
                     'estat'  => 1,
                     'failed' => '??',
                     'max'    => '??',
-                    'name'   => 't/sample-tests/die_head_end',
+                    'name'   => "$TEST_DIR/die_head_end",
                     'wstat'  => '256'
                 },
-                't/sample-tests/die_last_minute' => {
+                "$TEST_DIR/die_last_minute" => {
                     'canon'  => '??',
                     'estat'  => 1,
                     'failed' => 0,
                     'max'    => 4,
-                    'name'   => 't/sample-tests/die_last_minute',
+                    'name'   => "$TEST_DIR/die_last_minute",
                     'wstat'  => '256'
                 },
-                't/sample-tests/duplicates' => {
+                "$TEST_DIR/duplicates" => {
                     'canon'  => '??',
                     'estat'  => '',
                     'failed' => '??',
                     'max'    => 10,
-                    'name'   => 't/sample-tests/duplicates',
+                    'name'   => "$TEST_DIR/duplicates",
                     'wstat'  => ''
                 },
-                't/sample-tests/head_fail' => {
+                "$TEST_DIR/head_fail" => {
                     'canon'  => 2,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 4,
-                    'name'   => 't/sample-tests/head_fail',
+                    'name'   => "$TEST_DIR/head_fail",
                     'wstat'  => ''
                 },
-                't/sample-tests/inc_taint' => {
+                "$TEST_DIR/inc_taint" => {
                     'canon'  => 1,
                     'estat'  => 1,
                     'failed' => 1,
                     'max'    => 1,
-                    'name'   => 't/sample-tests/inc_taint',
+                    'name'   => "$TEST_DIR/inc_taint",
                     'wstat'  => '256'
                 },
-                't/sample-tests/no_nums' => {
+                "$TEST_DIR/no_nums" => {
                     'canon'  => 3,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 5,
-                    'name'   => 't/sample-tests/no_nums',
+                    'name'   => "$TEST_DIR/no_nums",
                     'wstat'  => ''
                 },
-                't/sample-tests/no_output' => {
+                "$TEST_DIR/no_output" => {
                     'canon'  => '??',
                     'estat'  => '',
                     'failed' => '??',
                     'max'    => '??',
-                    'name'   => 't/sample-tests/no_output',
+                    'name'   => "$TEST_DIR/no_output",
                     'wstat'  => ''
                 },
-                't/sample-tests/simple_fail' => {
+                "$TEST_DIR/simple_fail" => {
                     'canon'  => '2 5',
                     'estat'  => '',
                     'failed' => 2,
                     'max'    => 5,
-                    'name'   => 't/sample-tests/simple_fail',
+                    'name'   => "$TEST_DIR/simple_fail",
                     'wstat'  => ''
                 },
-                't/sample-tests/todo_misparse' => {
+                "$TEST_DIR/todo_misparse" => {
                     'canon'  => 1,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 1,
-                    'name'   => 't/sample-tests/todo_misparse',
+                    'name'   => "$TEST_DIR/todo_misparse",
                     'wstat'  => ''
                 },
-                't/sample-tests/too_many' => {
+                "$TEST_DIR/too_many" => {
                     'canon'  => '4-7',
                     'estat'  => 4,
                     'failed' => 4,
                     'max'    => 3,
-                    'name'   => 't/sample-tests/too_many',
+                    'name'   => "$TEST_DIR/too_many",
                     'wstat'  => '1024'
                 },
-                't/sample-tests/vms_nit' => {
+                "$TEST_DIR/vms_nit" => {
                     'canon'  => 1,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 2,
-                    'name'   => 't/sample-tests/vms_nit',
+                    'name'   => "$TEST_DIR/vms_nit",
                     'wstat'  => ''
                 }
             },
             'todo' => {
-                't/sample-tests/todo_inline' => {
+                "$TEST_DIR/todo_inline" => {
                     'canon'  => 2,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 2,
-                    'name'   => 't/sample-tests/todo_inline',
+                    'name'   => "$TEST_DIR/todo_inline",
                     'wstat'  => ''
                 }
             },
@@ -180,12 +182,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
           },
         'die' => {
             'failed' => {
-                't/sample-tests/die' => {
+                "$TEST_DIR/die" => {
                     'canon'  => '??',
                     'estat'  => 1,
                     'failed' => '??',
                     'max'    => '??',
-                    'name'   => 't/sample-tests/die',
+                    'name'   => "$TEST_DIR/die",
                     'wstat'  => '256'
                 }
             },
@@ -205,12 +207,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'die_head_end' => {
             'failed' => {
-                't/sample-tests/die_head_end' => {
+                "$TEST_DIR/die_head_end" => {
                     'canon'  => '??',
                     'estat'  => 1,
                     'failed' => '??',
                     'max'    => '??',
-                    'name'   => 't/sample-tests/die_head_end',
+                    'name'   => "$TEST_DIR/die_head_end",
                     'wstat'  => '256'
                 }
             },
@@ -230,12 +232,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'die_last_minute' => {
             'failed' => {
-                't/sample-tests/die_last_minute' => {
+                "$TEST_DIR/die_last_minute" => {
                     'canon'  => '??',
                     'estat'  => 1,
                     'failed' => 0,
                     'max'    => 4,
-                    'name'   => 't/sample-tests/die_last_minute',
+                    'name'   => "$TEST_DIR/die_last_minute",
                     'wstat'  => '256'
                 }
             },
@@ -255,12 +257,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'duplicates' => {
             'failed' => {
-                't/sample-tests/duplicates' => {
+                "$TEST_DIR/duplicates" => {
                     'canon'  => '??',
                     'estat'  => '',
                     'failed' => '??',
                     'max'    => 10,
-                    'name'   => 't/sample-tests/duplicates',
+                    'name'   => "$TEST_DIR/duplicates",
                     'wstat'  => ''
                 }
             },
@@ -296,12 +298,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'head_fail' => {
             'failed' => {
-                't/sample-tests/head_fail' => {
+                "$TEST_DIR/head_fail" => {
                     'canon'  => 2,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 4,
-                    'name'   => 't/sample-tests/head_fail',
+                    'name'   => "$TEST_DIR/head_fail",
                     'wstat'  => ''
                 }
             },
@@ -321,12 +323,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'inc_taint' => {
             'failed' => {
-                't/sample-tests/inc_taint' => {
+                "$TEST_DIR/inc_taint" => {
                     'canon'  => 1,
                     'estat'  => 1,
                     'failed' => 1,
                     'max'    => 1,
-                    'name'   => 't/sample-tests/inc_taint',
+                    'name'   => "$TEST_DIR/inc_taint",
                     'wstat'  => '256'
                 }
             },
@@ -378,12 +380,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'no_nums' => {
             'failed' => {
-                't/sample-tests/no_nums' => {
+                "$TEST_DIR/no_nums" => {
                     'canon'  => 3,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 5,
-                    'name'   => 't/sample-tests/no_nums',
+                    'name'   => "$TEST_DIR/no_nums",
                     'wstat'  => ''
                 }
             },
@@ -403,12 +405,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'no_output' => {
             'failed' => {
-                't/sample-tests/no_output' => {
+                "$TEST_DIR/no_output" => {
                     'canon'  => '??',
                     'estat'  => '',
                     'failed' => '??',
                     'max'    => '??',
-                    'name'   => 't/sample-tests/no_output',
+                    'name'   => "$TEST_DIR/no_output",
                     'wstat'  => ''
                 }
             },
@@ -492,12 +494,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'simple_fail' => {
             'failed' => {
-                't/sample-tests/simple_fail' => {
+                "$TEST_DIR/simple_fail" => {
                     'canon'  => '2 5',
                     'estat'  => '',
                     'failed' => 2,
                     'max'    => 5,
-                    'name'   => 't/sample-tests/simple_fail',
+                    'name'   => "$TEST_DIR/simple_fail",
                     'wstat'  => ''
                 }
             },
@@ -600,12 +602,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
                 ( $ENV{PERL5OPT} || '' ) =~ m{(?:^|\s)-[dM]};
             },
             'failed' => {
-                't/sample-tests/switches' => {
+                "$TEST_DIR/switches" => {
                     'canon'  => 1,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 1,
-                    'name'   => 't/sample-tests/switches',
+                    'name'   => "$TEST_DIR/switches",
                     'wstat'  => ''
                 }
             },
@@ -659,12 +661,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         'todo_inline' => {
             'failed' => {},
             'todo'   => {
-                't/sample-tests/todo_inline' => {
+                "$TEST_DIR/todo_inline" => {
                     'canon'  => 2,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 2,
-                    'name'   => 't/sample-tests/todo_inline',
+                    'name'   => "$TEST_DIR/todo_inline",
                     'wstat'  => ''
                 }
             },
@@ -683,12 +685,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'todo_misparse' => {
             'failed' => {
-                't/sample-tests/todo_misparse' => {
+                "$TEST_DIR/todo_misparse" => {
                     'canon'  => 1,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 1,
-                    'name'   => 't/sample-tests/todo_misparse',
+                    'name'   => "$TEST_DIR/todo_misparse",
                     'wstat'  => ''
                 }
             },
@@ -708,12 +710,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'too_many' => {
             'failed' => {
-                't/sample-tests/too_many' => {
+                "$TEST_DIR/too_many" => {
                     'canon'  => '4-7',
                     'estat'  => 4,
                     'failed' => 4,
                     'max'    => 3,
-                    'name'   => 't/sample-tests/too_many',
+                    'name'   => "$TEST_DIR/too_many",
                     'wstat'  => '1024'
                 }
             },
@@ -733,12 +735,12 @@ local $ENV{HARNESS_PERL_SWITCHES};
         },
         'vms_nit' => {
             'failed' => {
-                't/sample-tests/vms_nit' => {
+                "$TEST_DIR/vms_nit" => {
                     'canon'  => 1,
                     'estat'  => '',
                     'failed' => 1,
                     'max'    => 2,
-                    'name'   => 't/sample-tests/vms_nit',
+                    'name'   => "$TEST_DIR/vms_nit",
                     'wstat'  => ''
                 }
             },
@@ -785,13 +787,13 @@ local $ENV{HARNESS_PERL_SWITCHES};
         return $hash unless $^O eq 'VMS';
 
         while ( my ( $file, $want ) = each %$hash ) {
-            for ( qw( estat wstat ) ) {
+            for (qw( estat wstat )) {
                 if ( exists $want->{$_} ) {
                     $want->{$_} = $want->{$_} ? 1 : 0;
                 }
             }
         }
-        return $hash
+        return $hash;
     }
 
     {