X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FShell.t;h=13bba2255e9cd04b6fcfadbc533e369704bbbb71;hb=55ec0dff636c2a8ee5225314d7d46f928ab7f6da;hp=a285896e640f5bde6e4d12fb96b28d044c8e7483;hpb=72c157b023d430ca1a19cb152e889432a114232b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Shell.t b/lib/Shell.t
index a285896..13bba22 100644
--- a/lib/Shell.t
+++ b/lib/Shell.t
@@ -1,59 +1,84 @@
 #!./perl
 
-use Test::More tests => 4;
+BEGIN {
+    if( $ENV{PERL_CORE} ) {
+        chdir 't' if -d 't';
+        @INC = '../lib';
+    }
+}
+
+use Test::More tests => 7;
 
 BEGIN { use_ok('Shell'); }
 
+my $so = Shell->new;
+ok($so, 'Shell->new');
+
 my $Is_VMS     = $^O eq 'VMS';
 my $Is_MSWin32 = $^O eq 'MSWin32';
 my $Is_NetWare = $^O eq 'NetWare';
 
-$Shell::capture_stderr = 1; #
+$Shell::capture_stderr = 1;
 
 # Now test that that works ..
 
 my $tmpfile = 'sht0001';
-
-while ( -f $tmpfile )
-{
-  $tmpfile++;
+while ( -f $tmpfile ) {
+    $tmpfile++;
 }
+END { -f $tmpfile && (open STDERR, '>&SAVERR' and unlink $tmpfile) }
 
-END { -f $tmpfile && unlink $tmpfile };
-
-
+no warnings 'once'; 
+# no false warning about   Name "main::SAVERR" used only once: possible typo
 
-open(SAVERR,">&STDERR") ;
+open(SAVERR, ">&STDERR");
 open(STDERR, ">$tmpfile");
 
-xXx();  # Ok someone could have a program called this :(
+xXx_not_there();  # Ok someone could have a program called this :(
 
-ok( !(-s $tmpfile) ,'$Shell::capture_stderr');
+# On os2 the warning is on by default...
+ok(($^O eq 'os2' xor !(-s $tmpfile)), '$Shell::capture_stderr');
 
-$Shell::capture_stderr = 0; #
+$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 )
-{
-    ok(directory(),'Execute command');
+if ($Is_VMS) {
+    ok(directory(), 'Execute command');
     my @files = directory('*.*');
-    ok(@files,'Quoted arguments');
-}
-elsif( $Is_MSWin32 )
-{
-  ok(dir(),'Execute command');
+    ok(@files, 'Quoted arguments');
+
+    ok(eq_array(\@files, [$so->directory('*.*')]), 'object method');
+    eval { $so->directory };
+    ok(!$@, '2 methods calls');
+} elsif ($Is_MSWin32) {
+    ok(dir(), 'Execute command');
+    my @files = dir('*.*');
+    ok(@files, 'Quoted arguments');
+
+    ok(eq_array(\@files, [$so->dir('*.*')]), 'object method');
+    eval { $so->dir };
+    ok(!$@, '2 methods calls');
+} else {
+    ok(ls(), 'Execute command');
+    my @files = ls('*');
+    ok(@files, 'Quoted arguments');
+
+    ok(eq_array(\@files, [$so->ls('*')]), 'object method');
+    eval { $so->ls };
+    ok(!$@, '2 methods calls');
 
-  my @files = dir('*.*');
-
-  ok(@files, 'Quoted arguments');
 }
-else
-{
-  ok(ls(),'Execute command');
-
-  my @files = ls('*');
-
-  ok(@files,'Quoted arguments');
+open(STDERR, ">&SAVERR") ;
 
+if ($chdir) {
+  chdir "..";
 }