diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-03 03:02:54 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-12-03 03:02:54 +0000 |
| commit | ba0a2090f574df90404f8a0bbe689389ce0ebcab (patch) | |
| tree | 53f8d0ad53e5fc0f05d68a0073273080ef5bd392 /gnu/usr.bin/perl/vms/ext/filespec.t | |
| parent | 0121b80e4f69c2ad9631e8d20b5c91f3b2a40434 (diff) | |
Resolve conflicts for perl 5.8.2, remove old files, and add OpenBSD-specific scaffolding
Diffstat (limited to 'gnu/usr.bin/perl/vms/ext/filespec.t')
| -rw-r--r-- | gnu/usr.bin/perl/vms/ext/filespec.t | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/usr.bin/perl/vms/ext/filespec.t b/gnu/usr.bin/perl/vms/ext/filespec.t index 7123ffc51ce..559659f2afe 100644 --- a/gnu/usr.bin/perl/vms/ext/filespec.t +++ b/gnu/usr.bin/perl/vms/ext/filespec.t @@ -18,16 +18,17 @@ plan(tests => scalar(2*@tests)+6); foreach $test (@tests) { ($arg,$func,$expect) = split(/\s+/,$test); + $expect = undef if $expect eq 'undef'; $rslt = eval "$func('$arg')"; - is($@, '', "eval func('$arg')"); - is($rslt, $expect, " result"); + is($@, '', "eval ${func}('$arg')"); + is($rslt, $expect, "${func}('$arg'): '$rslt'"); } $defwarn = <<'EOW'; # Note: This failure may have occurred because your default device # was set using a non-concealed logical name. If this is the case, # you will need to determine by inspection that the two resultant -# file specifications shwn above are in fact equivalent. +# file specifications shown above are in fact equivalent. EOW is(uc(rmsexpand('[]')), "\U$ENV{DEFAULT}", 'rmsexpand()') || print $defwarn; @@ -86,9 +87,9 @@ __down_:[__the_.__garden_.__path_] fileify __down_:[__the_.__garden_]__path_ __down_/__the_/__garden_/__path_ fileify __down_/__the_/__garden_/__path_.dir;1 __down_:[__the_.__garden_]__path_ fileify __down_:[__the_.__garden_]__path_.dir;1 __down_:[__the_.__garden_]__path_. fileify # N.B. trailing . ==> null type -__down_:[__the_]__garden_.__path_ fileify +__down_:[__the_]__garden_.__path_ fileify undef /__down_/__the_/__garden_/__path_. fileify # N.B. trailing . ==> null type -/__down_/__the_/__garden_.__path_ fileify +/__down_/__the_/__garden_.__path_ fileify undef # and pathifying them __down_:[__the_.__garden_]__path_.dir;1 pathify __down_:[__the_.__garden_.__path_] @@ -97,15 +98,15 @@ __down_:[__the_.__garden_]__path_.dir;1 pathify __down_:[__the_.__garden_ __down_/__the_/__garden_/__path_.dir pathify __down_/__the_/__garden_/__path_/ __down_:[__the_.__garden_]__path_ pathify __down_:[__the_.__garden_.__path_] __down_:[__the_.__garden_]__path_. pathify # N.B. trailing . ==> null type -__down_:[__the_]__garden_.__path_ pathify +__down_:[__the_]__garden_.__path_ pathify undef /__down_/__the_/__garden_/__path_. pathify # N.B. trailing . ==> null type -/__down_/__the_/__garden_.__path_ pathify +/__down_/__the_/__garden_.__path_ pathify undef __down_:[__the_.__garden_]__path_.dir;2 pathify #N.B. ;2 __path_ pathify __path_/ /__down_/__the_/__garden_/. pathify /__down_/__the_/__garden_/./ /__down_/__the_/__garden_/.. pathify /__down_/__the_/__garden_/../ /__down_/__the_/__garden_/... pathify /__down_/__the_/__garden_/.../ -__path_.notdir pathify +__path_.notdir pathify undef # Both VMS/Unix and file/path conversions __down_:[__the_.__garden_]__path_.dir;1 unixpath /__down_/__the_/__garden_/__path_/ |