Remove the "malloc wrappage" tests, due to their unportability

[perl5.git] / t / test.pl

diff --git a/t/test.pl b/t/test.pl
index eedd0ca..9407129 100644 (file)
--- a/t/test.pl
+++ b/t/test.pl
@@ -235,21 +235,18 @@ sub within ($$$@) {
 }
 
 # Note: this isn't quite as fancy as Test::More::like().
-sub like ($$@) {
-    my ($got, $expected, $name, @mess) = @_;
+
+sub like   ($$@) { like_yn (0,@_) }; # 0 for -
+sub unlike ($$@) { like_yn (1,@_) }; # 1 for un-
+
+sub like_yn ($$$@) {
+    my ($flip, $got, $expected, $name, @mess) = @_;
     my $pass;
-    if (ref $expected eq 'Regexp') {
-       $pass = $got =~ $expected;
-       unless ($pass) {
-           unshift(@mess, "#      got '$got'\n",
-                          "# expected /$expected/\n");
-       }
-    } else {
-       $pass = $got =~ /$expected/;
-       unless ($pass) {
-           unshift(@mess, "#      got '$got'\n",
-                          "# expected /$expected/\n");
-       }
+    $pass = $got =~ /$expected/ if !$flip;
+    $pass = $got !~ /$expected/ if $flip;
+    unless ($pass) {
+       unshift(@mess, "#      got '$got'\n",
+               "# expected /$expected/\n");
     }
     _ok($pass, _where(), $name, @mess);
 }
@@ -385,12 +382,13 @@ sub _create_runperl { # Create the string to qx in runperl().
        _quote_args(\$runperl, $args{switches});
     }
     if (defined $args{prog}) {
-       local $Level = 2;
-       die "test.pl:runperl(): 'progs' must be an ARRAYREF " . _where()
-           unless ref $args{progs} eq "ARRAY";
+       die "test.pl:runperl(): both 'prog' and 'progs' cannot be used " . _where()
+           if defined $args{progs};
         $args{progs} = [$args{prog}]
     }
     if (defined $args{progs}) {
+       die "test.pl:runperl(): 'progs' must be an ARRAYREF " . _where()
+           unless ref $args{progs} eq "ARRAY";
         foreach my $prog (@{$args{progs}}) {
             if ($is_mswin || $is_netware || $is_vms) {
                 $runperl .= qq ( -e "$prog" );
@@ -585,7 +583,7 @@ sub _fresh_perl {
 }
 
 #
-# run_perl_is
+# fresh_perl_is
 #
 # Combination of run_perl() and is().
 #
@@ -599,7 +597,7 @@ sub fresh_perl_is {
 }
 
 #
-# run_perl_like
+# fresh_perl_like
 #
 # Combination of run_perl() and like().
 #