RE: 05gzsetp.t and initial 'ver' in test output

From: "Paul Marquess" <Paul.Marquess@ntlworld.com>
Message-Id: <20050611212234.UGOL29707.aamta11-winn.ispmail.ntl.com@MARQUESSPT21>

p4raw-id: //depot/perl@24805

3 files changed, 12 insertions, 8 deletions

diff --git a/ext/Compress/Zlib/Makefile.PL b/ext/Compress/Zlib/Makefile.PL
index 558ce72828..f6861baf43 100755
--- a/ext/Compress/Zlib/Makefile.PL
+++ b/ext/Compress/Zlib/Makefile.PL
@@ -66,7 +66,7 @@ EOM
 ParseCONFIG() ;
 
 my @files = ('Zlib.pm', glob("t/*.t"), grep(!/\.bak$/,  glob("examples/*"))) ;
-UpDowngrade(@files);
+UpDowngrade(@files) unless $ENV{PERL_CORE}; 
 
 WriteMakefile(	
 	NAME   	 	=> 'Compress::Zlib',
@@ -351,10 +351,8 @@ sub UpDowngrade
           { return }
     }
 
-    unless ($ENV{PERL_CORE}) {
-      foreach (@files)
-        { doUpDown($our_sub, $warn_sub, $_) }
-    }
+    foreach (@files)
+      { doUpDown($our_sub, $warn_sub, $_) }
 
     warn "Up/Downgrade complete.\n" ;
     exit 0 if $upgrade || $downgrade;
diff --git a/ext/Compress/Zlib/Zlib.pm b/ext/Compress/Zlib/Zlib.pm
index 0521ee6c57..71c6706d0c 100644
--- a/ext/Compress/Zlib/Zlib.pm
+++ b/ext/Compress/Zlib/Zlib.pm
@@ -855,8 +855,11 @@ Here is an example of using B<inflate>.
 =head1 COMPRESS/UNCOMPRESS
 
 Two high-level functions are provided by I<zlib> to perform in-memory
-compression. They are B<compress> and B<uncompress>. Two Perl subs are
-provided which provide similar functionality.
+compression/uncompression of RFC1950 data streams. They are called
+B<compress> and B<uncompress>.
+
+The two Perl subs defined below provide the equivalent
+functionality.
 
 =over 5
 
@@ -882,6 +885,9 @@ The source buffer can either be a scalar or a scalar reference.
 
 =back
 
+Please note: the two functions defined above are I<not> compatible with
+the Unix commands of the same name.
+
 =head1 GZIP INTERFACE
 
 A number of functions are supplied in I<zlib> for reading and writing
diff --git a/ext/Compress/Zlib/t/05gzsetp.t b/ext/Compress/Zlib/t/05gzsetp.t
index 9988ac60cc..5c524c9006 100644
--- a/ext/Compress/Zlib/t/05gzsetp.t
+++ b/ext/Compress/Zlib/t/05gzsetp.t
@@ -9,7 +9,6 @@ BEGIN
 {
  
     my $ver = Compress::Zlib::zlib_version();
-    print "ver $ver\n";
     if (defined $ver && $ver =~ /^(\d+)\.(\d+)\.(\d+)/ )
     {
         my $sum = $1 * 1000000 + $2 * 1000 + $3 ;
@@ -81,4 +80,5 @@ ok(1, Compress::Zlib::zlib_version eq ZLIB_VERSION) ;
 
     ok(10, $uncompressed  eq $input ) ;
     ok(11, ! $k->gzclose ) ;
+    unlink $name ;
 }