Move Shell from lib to ext

diff --git a/MANIFEST b/MANIFEST
index e492462..32fb41f 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1203,6 +1203,8 @@ ext/SDBM_File/sdbm/tune.h SDBM kit
 ext/SDBM_File/sdbm/util.c      SDBM kit
 ext/SDBM_File/t/sdbm.t         See if SDBM_File works
 ext/SDBM_File/typemap          SDBM extension interface types
+ext/Shell/Shell.pm             Make AUTOLOADed system() calls
+ext/Shell/t/Shell.t            Tests for above
 ext/Socket/Makefile.PL         Socket extension makefile writer
 ext/Socket/Socket.pm           Socket extension Perl module
 ext/Socket/Socket.xs           Socket extension external subroutines
@@ -3111,8 +3113,6 @@ lib/SelectSaver.t         See if SelectSaver works
 lib/SelfLoader.pm              Load functions only on demand
 lib/SelfLoader/t/01SelfLoader.t        See if SelfLoader works
 lib/SelfLoader/t/02SelfLoader-buggy.t  See if SelfLoader works
-lib/Shell.pm                   Make AUTOLOADed system() calls
-lib/Shell.t                    Tests for above
 lib/shellwords.pl              Perl library to split into words with shell quoting
 lib/sigtrap.pm                 For trapping an abort and giving traceback
 lib/sigtrap.t                  See if sigtrap works

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8b2e4b5..a761f54 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1597,11 +1597,8 @@ package Maintainers;
        {
        'MAINTAINER'    => 'ferreira',
        'DISTRIBUTION'  => 'FERREIRA/Shell-0.72.tar.gz',
-       'FILES'         => q[lib/Shell.pm lib/Shell.t],
+       'FILES'         => q[ext/Shell],
        'EXCLUDED'      => [ qw{ t/01_use.t t/99_pod.t } ],
-       'MAP'           => { ''  => 'lib/',
-                            't/'=> 'lib/',
-                          },
        'CPAN'          => 1,
        'UPSTREAM'      => undef,
        },

diff --git a/lib/Shell.pm b/ext/Shell/Shell.pm
similarity index 100%
rename from lib/Shell.pm
rename to ext/Shell/Shell.pm

diff --git a/lib/Shell.t b/ext/Shell/t/Shell.t
similarity index 81%
rename from lib/Shell.t
rename to ext/Shell/t/Shell.t
index 13bba22..31bf9d2 100644 (file)
--- a/lib/Shell.t
+++ b/ext/Shell/t/Shell.t
@@ -1,12 +1,5 @@
 #!./perl
 
-BEGIN {
-    if( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = '../lib';
-    }
-}
-
 use Test::More tests => 7;
 
 BEGIN { use_ok('Shell'); }
@@ -41,14 +34,6 @@ ok(($^O eq 'os2' xor !(-s $tmpfile)), '$Shell::capture_stderr');
 
 $Shell::capture_stderr = 0;
 
-# Trying to do two repeated C<ls>s in t in core and expecting the same output
-# is a race condition when tests are running in parallel, and using it as a
-# temporary directory. So go somewhere quieter.
-if ($ENV{PERL_CORE} && -d 'uni') {
-  chdir 'uni';
-  $chdir++;
-}
-
 # someone will have to fill in the blanks for other platforms
 
 if ($Is_VMS) {