From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Wed, 30 Apr 2008 09:40:36 +0000 (+0000)
Subject: Avoid garbage in test output when running make minitest.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb5a2f3c949914007f75402d04b24b6c228e8e5c;p=p5sagit%2Fp5-mst-13.2.git

Avoid garbage in test output when running make minitest.
This makes all minitests pass on my machine.

p4raw-id: //depot/perl@33768
---

diff --git a/t/op/dbm.t b/t/op/dbm.t
index 5c552ac..e6545fa 100644
--- a/t/op/dbm.t
+++ b/t/op/dbm.t
@@ -6,7 +6,7 @@ BEGIN {
     require './test.pl';
 
     eval { require AnyDBM_File }; # not all places have dbm* functions
-      skip_all("No dbm functions: $@") if $@;
+    skip_all("No dbm functions") if $@;
 }
 
 plan tests => 4;
diff --git a/t/op/pat.t b/t/op/pat.t
index 1e84532..ec4222c 100755
--- a/t/op/pat.t
+++ b/t/op/pat.t
@@ -2054,6 +2054,7 @@ sub ok ($;$) {
 
 sub skip {
     my $why = shift;
+    $why =~ s/\n.*//s;
     my $n    = @_ ? shift : 1;
     for (1..$n) {
         print "ok $test # skip: $why\n";