Merge in perl 5.10.1; part two

50 files changed, 5 insertions, 310 deletions

diff --git a/gnu/usr.bin/perl/t/lib/Dummy.pm b/gnu/usr.bin/perl/t/lib/Dummy.pm
deleted file mode 100644
index 504330f8b16..00000000000
--- a/gnu/usr.bin/perl/t/lib/Dummy.pm
+++ /dev/null
@@ -1,4 +0,0 @@
-package Dummy;
-
-# Attempt to emulate a bug with finding the version in Exporter.
-$VERSION = '5.562';
diff --git a/gnu/usr.bin/perl/t/lib/HasSigDie.pm b/gnu/usr.bin/perl/t/lib/HasSigDie.pm
deleted file mode 100644
index 3368e049957..00000000000
--- a/gnu/usr.bin/perl/t/lib/HasSigDie.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package HasSigDie;
-
-$SIG{__DIE__} = sub { "Die, Bart, Die!" };
-
-1;
-
diff --git a/gnu/usr.bin/perl/t/lib/NoExporter.pm b/gnu/usr.bin/perl/t/lib/NoExporter.pm
deleted file mode 100644
index 1ab5b8f9f42..00000000000
--- a/gnu/usr.bin/perl/t/lib/NoExporter.pm
+++ /dev/null
@@ -1,10 +0,0 @@
-package NoExporter;
-
-$VERSION = 1.02;
-sub import { 
-    shift;
-    die "NoExporter exports nothing.  You asked for: @_" if @_;
-}
-
-1;
-
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/Catch.pm b/gnu/usr.bin/perl/t/lib/Test/Simple/Catch.pm
index 6f6049356db..9a2efb192d6 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/Catch.pm
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/Catch.pm
@@ -1,7 +1,8 @@
 # For testing Test::Simple;
-# $Id$
 package Test::Simple::Catch;
 
+use strict;
+
 use Symbol;
 use TieOut;
 my( $out_fh, $err_fh ) = ( gensym, gensym );
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death.plx
index 14ec3d6d97f..e682ec08a25 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_in_eval.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_in_eval.plx
index f3fb6ab3758..269bffa8025 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_in_eval.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_in_eval.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 use Carp;
 
 push @INC, 't/lib';
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_with_handler.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_with_handler.plx
index 935ab36ac70..7dabb31d609 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_with_handler.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/death_with_handler.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id: death_with_handler.plx,v 1.1 2009/05/16 21:42:58 simon Exp $
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
@@ -16,4 +15,6 @@ tie *STDERR, 'Dev::Null';
 
 ok(1);
 ok(1);
+
+$! = 0;
 die "This is a test";
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/exit.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/exit.plx
index 26c3b031ef6..7f8ff73f752 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/exit.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/exit.plx
@@ -1,4 +1,3 @@
 require Test::Builder;
-# $Id: exit.plx,v 1.2 2009/05/16 21:42:58 simon Exp $
 
 exit 1;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/extras.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/extras.plx
index d2e9e99baf8..c9c89520aa3 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/extras.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/extras.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/five_fail.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/five_fail.plx
index 6110cb6f652..c058e1f8f01 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/five_fail.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/five_fail.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 use lib 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/last_minute_death.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/last_minute_death.plx
index 94274adf046..e3d01beeb78 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/last_minute_death.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/last_minute_death.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
@@ -16,4 +15,5 @@ ok(1);
 ok(1);
 ok(1);
 
+$! = 0;
 die "This is a test";
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/one_fail.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/one_fail.plx
index 80aba3109be..99c720250d2 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/one_fail.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/one_fail.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/pre_plan_death.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
index 6b2ddb87832..f72d3b65e57 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/pre_plan_death.plx
@@ -1,5 +1,4 @@
 # ID 20020716.013, the exit code would become 0 if the test died
-# $Id: pre_plan_death.plx,v 1.2 2009/05/16 21:42:58 simon Exp $
 # before a plan.
 
 require Test::Simple;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/require.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/require.plx
index 7f9adebf87d..1a06690d9dc 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/require.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/require.plx
@@ -1,2 +1 @@
 require Test::Simple;
-# $Id$
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/success.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/success.plx
index 99c2d9b542c..585d6c3d790 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/success.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/success.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few.plx
index 003b07d6ed4..bbc630ddcec 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few_fail.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few_fail.plx
index e5ab8b3e1d3..9ca4517b662 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few_fail.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/too_few_fail.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id: too_few_fail.plx,v 1.2 2009/05/16 21:42:58 simon Exp $
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/two_fail.plx b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/two_fail.plx
index d4d6c378fff..e3d92296af9 100644
--- a/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/two_fail.plx
+++ b/gnu/usr.bin/perl/t/lib/Test/Simple/sample_tests/two_fail.plx
@@ -1,5 +1,4 @@
 require Test::Simple;
-# $Id$
 
 push @INC, 't/lib';
 require Test::Simple::Catch;
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/bailout b/gnu/usr.bin/perl/t/lib/sample-tests/bailout
deleted file mode 100644
index f67f673e7d3..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/bailout
+++ /dev/null
@@ -1,9 +0,0 @@
-print <<DUMMY_TEST;
-1..5
-ok 1
-ok 2
-ok 3
-Bail out!  GERONIMMMOOOOOO!!!
-ok 4
-ok 5
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/bignum b/gnu/usr.bin/perl/t/lib/sample-tests/bignum
deleted file mode 100644
index b5824a12a10..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/bignum
+++ /dev/null
@@ -1,7 +0,0 @@
-print <<DUMMY;
-1..2
-ok 1
-ok 2
-ok 136211425
-ok 136211426
-DUMMY
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/bignum_many b/gnu/usr.bin/perl/t/lib/sample-tests/bignum_many
deleted file mode 100644
index 1e30b2f1dd2..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/bignum_many
+++ /dev/null
@@ -1,14 +0,0 @@
-print <<DUMMY;
-1..2
-ok 1
-ok 2
-ok 99997
-ok 99998
-ok 99999
-ok 100000
-ok 100001
-ok 100002
-ok 100003
-ok 100004
-ok 100005
-DUMMY
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/combined b/gnu/usr.bin/perl/t/lib/sample-tests/combined
deleted file mode 100644
index 8dfaa28e926..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/combined
+++ /dev/null
@@ -1,13 +0,0 @@
-print <<DUMMY_TEST;
-1..10 todo 4 10
-ok 1
-ok 2 basset hounds got long ears
-not ok 3        all hell broke lose
-ok 4
-ok
-ok 6
-ok 7            # Skip contract negociations
-ok 8
-not ok 9
-not ok 10
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/descriptive b/gnu/usr.bin/perl/t/lib/sample-tests/descriptive
deleted file mode 100644
index e165ac1bf5c..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/descriptive
+++ /dev/null
@@ -1,8 +0,0 @@
-print <<DUMMY_TEST;
-1..5
-ok 1    Interlock activated
-ok 2    Megathrusters are go
-ok 3    Head formed
-ok 4    Blazing sword formed
-ok 5    Robeast destroyed
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/die b/gnu/usr.bin/perl/t/lib/sample-tests/die
deleted file mode 100644
index 4c8534082da..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/die
+++ /dev/null
@@ -1,2 +0,0 @@
-use if ($^O eq 'VMS'), vmsish => 'hushed';
-exit 1;  # exit because die() can be noisy
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/die_head_end b/gnu/usr.bin/perl/t/lib/sample-tests/die_head_end
deleted file mode 100644
index afcea1b3c83..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/die_head_end
+++ /dev/null
@@ -1,9 +0,0 @@
-print <<DUMMY_TEST;
-ok 1
-ok 2
-ok 3
-ok 4
-DUMMY_TEST
-
-use if $^O eq 'VMS', vmsish => 'hushed';
-exit 1;
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/die_last_minute b/gnu/usr.bin/perl/t/lib/sample-tests/die_last_minute
deleted file mode 100644
index e421dd1c0e2..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/die_last_minute
+++ /dev/null
@@ -1,10 +0,0 @@
-print <<DUMMY_TEST;
-ok 1
-ok 2
-ok 3
-ok 4
-1..4
-DUMMY_TEST
-
-use if $^O eq 'VMS', vmsish => 'hushed';
-exit 1;
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/duplicates b/gnu/usr.bin/perl/t/lib/sample-tests/duplicates
deleted file mode 100644
index 63f6a706b63..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/duplicates
+++ /dev/null
@@ -1,14 +0,0 @@
-print <<DUMMY_TEST
-1..10
-ok 1
-ok 2
-ok 3
-ok 4
-ok 4
-ok 5
-ok 6
-ok 7
-ok 8
-ok 9
-ok 10
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/head_end b/gnu/usr.bin/perl/t/lib/sample-tests/head_end
deleted file mode 100644
index 14a32f2fe6b..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/head_end
+++ /dev/null
@@ -1,11 +0,0 @@
-print <<DUMMY_TEST;
-# comments
-ok 1
-ok 2
-ok 3
-ok 4
-# comment
-1..4
-# more ignored stuff
-# and yet more
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/head_fail b/gnu/usr.bin/perl/t/lib/sample-tests/head_fail
deleted file mode 100644
index 9d1667ab19a..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/head_fail
+++ /dev/null
@@ -1,11 +0,0 @@
-print <<DUMMY_TEST;
-# comments
-ok 1
-not ok 2
-ok 3
-ok 4
-# comment
-1..4
-# more ignored stuff
-# and yet more
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/inc_taint b/gnu/usr.bin/perl/t/lib/sample-tests/inc_taint
deleted file mode 100644
index c0dc994989c..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/inc_taint
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use lib qw(t/lib);
-use Test::More tests => 1;
-
-ok( grep(/we_added_this_lib/, @INC) );
-
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/lone_not_bug b/gnu/usr.bin/perl/t/lib/sample-tests/lone_not_bug
deleted file mode 100644
index 10eaa2a3b02..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/lone_not_bug
+++ /dev/null
@@ -1,9 +0,0 @@
-# There was a bug where the first test would be considered a
-# 'lone not' failure.
-print <<DUMMY;
-ok 1
-ok 2
-ok 3
-ok 4
-1..4
-DUMMY
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/no_nums b/gnu/usr.bin/perl/t/lib/sample-tests/no_nums
deleted file mode 100644
index c32d3f22baa..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/no_nums
+++ /dev/null
@@ -1,8 +0,0 @@
-print <<DUMMY_TEST;
-1..5
-ok
-ok
-not ok
-ok
-ok
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/no_output b/gnu/usr.bin/perl/t/lib/sample-tests/no_output
deleted file mode 100644
index 505acda7e6d..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/no_output
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/perl -w
-
-exit;
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/out_of_order b/gnu/usr.bin/perl/t/lib/sample-tests/out_of_order
deleted file mode 100644
index 77641aa3620..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/out_of_order
+++ /dev/null
@@ -1,22 +0,0 @@
-# From a bungled core thread test.
-#
-# The important thing here is that the last test is the right test.
-# Test::Harness would misparse this as being a valid test.
-print <<DUMMY;
-ok 2 - Test that argument passing works
-ok 3 - Test that passing arguments as references work
-ok 4 - Test a normal sub
-ok 6 - Detach test
-ok 8 - Nested thread test
-ok 9 - Nested thread test
-ok 10 - Wanted 7, got 7
-ok 11 - Wanted 7, got 7
-ok 12 - Wanted 8, got 8
-ok 13 - Wanted 8, got 8
-1..15
-ok 1
-ok 5 - Check that Config::threads is true
-ok 7 - Detach test
-ok 14 - Check so that tid for threads work for main thread
-ok 15 - Check so that tid for threads work for main thread
-DUMMY
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/segfault b/gnu/usr.bin/perl/t/lib/sample-tests/segfault
deleted file mode 100644
index c5670a42b59..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/segfault
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/perl
-
-print "1..1\n";
-print "ok 1\n";
-kill 11, $$;
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/shbang_misparse b/gnu/usr.bin/perl/t/lib/sample-tests/shbang_misparse
deleted file mode 100644
index bc1b524a347..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/shbang_misparse
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/perl-latest
-
-# The above #! line was misparsed as having a -t.
-# Pre-5.8 this will simply cause perl to choke, since there was no -t.
-# Post-5.8 taint warnings will mistakenly be on.
-
-print "1..2\n";
-print "ok 1\n";
-my $warning = '';
-$SIG{__WARN__} = sub { $warning .= $_[0] };
-eval("#" . substr($0, 0, 0));
-print $warning ? "not ok 2\n" : "ok 2\n";
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/simple b/gnu/usr.bin/perl/t/lib/sample-tests/simple
deleted file mode 100644
index d6b85846b26..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/simple
+++ /dev/null
@@ -1,8 +0,0 @@
-print <<DUMMY_TEST;
-1..5
-ok 1
-ok 2
-ok 3
-ok 4
-ok 5
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/simple_fail b/gnu/usr.bin/perl/t/lib/sample-tests/simple_fail
deleted file mode 100644
index aa65f5f66de..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/simple_fail
+++ /dev/null
@@ -1,8 +0,0 @@
-print <<DUMMY_TEST;
-1..5
-ok 1
-not ok 2
-ok 3
-ok 4
-not ok 5
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/skip b/gnu/usr.bin/perl/t/lib/sample-tests/skip
deleted file mode 100644
index 6a9cd662bc4..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/skip
+++ /dev/null
@@ -1,8 +0,0 @@
-print <<DUMMY_TEST;
-1..5
-ok 1
-ok 2    # skip rain delay
-ok 3
-ok 4
-ok 5
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/skip_nomsg b/gnu/usr.bin/perl/t/lib/sample-tests/skip_nomsg
deleted file mode 100644
index 51d1ed6b43f..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/skip_nomsg
+++ /dev/null
@@ -1,4 +0,0 @@
-print <<DUMMY;
-1..1
-ok 1 # Skip
-DUMMY
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/skipall b/gnu/usr.bin/perl/t/lib/sample-tests/skipall
deleted file mode 100644
index 8c4679660c2..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/skipall
+++ /dev/null
@@ -1,3 +0,0 @@
-print <<DUMMY_TEST;
-1..0 # skip: rope
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/skipall_nomsg b/gnu/usr.bin/perl/t/lib/sample-tests/skipall_nomsg
deleted file mode 100644
index 9b0dc11a697..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/skipall_nomsg
+++ /dev/null
@@ -1,2 +0,0 @@
-print "1..0\n";
-exit 0;
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/switches b/gnu/usr.bin/perl/t/lib/sample-tests/switches
deleted file mode 100644
index 8ce9c9a589e..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/switches
+++ /dev/null
@@ -1,2 +0,0 @@
-print "1..1\n";
-print $INC{'strict.pm'} ? "ok 1\n" : "not ok 1\n";
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/taint b/gnu/usr.bin/perl/t/lib/sample-tests/taint
deleted file mode 100644
index 42968d36e32..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/taint
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl -Tw
-
-use lib qw(t/lib);
-use Test::More tests => 1;
-
-eval { kill 0, $^X };
-like( $@, '/^Insecure dependency/',   '-T honored' );
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/taint_warn b/gnu/usr.bin/perl/t/lib/sample-tests/taint_warn
deleted file mode 100644
index 5b4c4861667..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/taint_warn
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/perl -tw
-
-use lib qw(t/lib);
-use Test::More tests => 1;
-
-my $warnings = '';
-{
-    local $SIG{__WARN__} = sub { $warnings .= join '', @_ };
-    kill 0, $^X;
-}
-like( $warnings, '/^Insecure dependency/',   '-t honored' );
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/todo b/gnu/usr.bin/perl/t/lib/sample-tests/todo
deleted file mode 100644
index 5620ee20ee0..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/todo
+++ /dev/null
@@ -1,8 +0,0 @@
-print <<DUMMY_TEST;
-1..5 todo 3   2;
-ok 1
-ok 2
-not ok 3
-ok 4
-ok 5
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/todo_inline b/gnu/usr.bin/perl/t/lib/sample-tests/todo_inline
deleted file mode 100644
index 5b96d68caf2..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/todo_inline
+++ /dev/null
@@ -1,6 +0,0 @@
-print <<DUMMY_TEST;
-1..3
-not ok 1 - Foo # TODO Just testing the todo interface.
-ok 2 - Unexpected success # TODO Just testing the todo interface.
-ok 3 - This is not todo
-DUMMY_TEST
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/too_many b/gnu/usr.bin/perl/t/lib/sample-tests/too_many
deleted file mode 100644
index 46acaded4d5..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/too_many
+++ /dev/null
@@ -1,14 +0,0 @@
-print <<DUMMY;
-1..3
-ok 1
-ok 2
-ok 3
-ok 4
-ok 5
-ok 6
-ok 7
-DUMMY
-
-exit 4;  # simulate Test::More's exit status
-
-
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/vms_nit b/gnu/usr.bin/perl/t/lib/sample-tests/vms_nit
deleted file mode 100644
index 1df7804309f..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/vms_nit
+++ /dev/null
@@ -1,6 +0,0 @@
-print <<DUMMY;
-1..2
-not 
-ok 1
-ok 2
-DUMMY
diff --git a/gnu/usr.bin/perl/t/lib/sample-tests/with_comments b/gnu/usr.bin/perl/t/lib/sample-tests/with_comments
deleted file mode 100644
index 7aa913985b1..00000000000
--- a/gnu/usr.bin/perl/t/lib/sample-tests/with_comments
+++ /dev/null
@@ -1,14 +0,0 @@
-print <<DUMMY_TEST;
-# and stuff
-1..5 todo 1 2 4 5;
-# yeah, that
-not ok 1
-# Failed test 1 in t/todo.t at line 9 *TODO*
-ok 2 # (t/todo.t at line 10 TODO?!)
-ok 3
-not ok 4
-# Test 4 got: '0' (t/todo.t at line 12 *TODO*)
-#   Expected: '1' (need more tuits)
-ok 5 # (t/todo.t at line 13 TODO?!)
-# woo
-DUMMY_TEST