X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fext%2Ffilespec.t;h=3415400b21644c8e6ebf6fc1466f517e765ea7e7;hb=6151c65c62ce7952920524e0fc7266714fb41c2f;hp=bab728840e6e72e3a96ffdfff259e20443a7ee9a;hpb=cd5cd3a3766ffcb0f17864b0a5545d066441ebf8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/vms/ext/filespec.t b/vms/ext/filespec.t
index bab7288..3415400 100644
--- a/vms/ext/filespec.t
+++ b/vms/ext/filespec.t
@@ -3,6 +3,7 @@
 BEGIN { unshift(@INC,'../lib') if -d '../lib'; }
 
 use VMS::Filespec;
+use File::Spec;
 
 foreach (<DATA>) {
   chomp;
@@ -17,23 +18,24 @@ 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(lc($rslt), lc($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(rmsexpand('[]'),       "\U$ENV{DEFAULT}", 'rmsexpand()') || print $defwarn;
-is(rmsexpand('from.here'),"\L$ENV{DEFAULT}from.here") || print $defwarn;
-is(rmsexpand('from'),     "\L$ENV{DEFAULT}from")      || print $defwarn;
+is(uc(rmsexpand('[]')),   "\U$ENV{DEFAULT}", 'rmsexpand()') || print $defwarn;
+is(lc(rmsexpand('from.here')),"\L$ENV{DEFAULT}from.here") || print $defwarn;
+is(lc(rmsexpand('from')),     "\L$ENV{DEFAULT}from")      || print $defwarn;
 
-is(rmsexpand('from.here','cant:[get.there];2'),
+is(lc(rmsexpand('from.here','cant:[get.there];2')),
    'cant:[get.there]from.here;2')                     || print $defwarn;
 
 
@@ -44,31 +46,34 @@ ok(rmdir('testdir/'),           '    rmdir()');
 
 __DATA__
 
+# lots of underscores used to minimize collision with existing logical names
+
 # Basic VMS to Unix filespecs
-some_logical_name_not_likely:[where.over]the.rainbow	unixify	/some_logical_name_not_likely/where/over/the.rainbow
-[.some_logical_name_not_likely.where.over]the.rainbow	unixify	some_logical_name_not_likely/where/over/the.rainbow
-[-.some_logical_name_not_likely.where.over]the.rainbow	unixify	../some_logical_name_not_likely/where/over/the.rainbow
-[.some_logical_name_not_likely.--.where.over]the.rainbow	unixify	some_logical_name_not_likely/../../where/over/the.rainbow
-[.some_logical_name_not_likely...where.over]the.rainbow	unixify	some_logical_name_not_likely/.../where/over/the.rainbow
-[...some_logical_name_not_likely.where.over]the.rainbow	unixify	.../some_logical_name_not_likely/where/over/the.rainbow
-[.some_logical_name_not_likely.where.over...]the.rainbow	unixify	some_logical_name_not_likely/where/over/.../the.rainbow
-[.some_logical_name_not_likely.where.over...]	unixify	some_logical_name_not_likely/where/over/.../
-[.some_logical_name_not_likely.where.over.-]	unixify	some_logical_name_not_likely/where/over/../
+__some_:[__where_.__over_]__the_.__rainbow_    unixify /__some_/__where_/__over_/__the_.__rainbow_
+[.__some_.__where_.__over_]__the_.__rainbow_   unixify __some_/__where_/__over_/__the_.__rainbow_
+[-.__some_.__where_.__over_]__the_.__rainbow_  unixify ../__some_/__where_/__over_/__the_.__rainbow_
+[.__some_.--.__where_.__over_]__the_.__rainbow_        unixify __some_/../../__where_/__over_/__the_.__rainbow_
+[.__some_...__where_.__over_]__the_.__rainbow_ unixify __some_/.../__where_/__over_/__the_.__rainbow_
+[...__some_.__where_.__over_]__the_.__rainbow_ unixify .../__some_/__where_/__over_/__the_.__rainbow_
+[.__some_.__where_.__over_...]__the_.__rainbow_        unixify __some_/__where_/__over_/.../__the_.__rainbow_
+[.__some_.__where_.__over_...] unixify __some_/__where_/__over_/.../
+[.__some_.__where_.__over_.-]  unixify __some_/__where_/__over_/../
 []	unixify		./
 [-]	unixify		../
 [--]	unixify		../../
 [...]	unixify		.../
+__lyrics_:[__are_.__very_^.__sappy_]__but_^.__rhymes_^.__are_.__true_    unixify /__lyrics_/__are_/__very_.__sappy_/__but_.__rhymes_.__are_.__true_
 
 # and back again
-/some_logical_name_not_likely/where/over/the.rainbow	vmsify	some_logical_name_not_likely:[where.over]the.rainbow
-some_logical_name_not_likely/where/over/the.rainbow	vmsify	[.some_logical_name_not_likely.where.over]the.rainbow
-../some_logical_name_not_likely/where/over/the.rainbow	vmsify	[-.some_logical_name_not_likely.where.over]the.rainbow
-some_logical_name_not_likely/../../where/over/the.rainbow	vmsify	[-.where.over]the.rainbow
-.../some_logical_name_not_likely/where/over/the.rainbow	vmsify	[...some_logical_name_not_likely.where.over]the.rainbow
-some_logical_name_not_likely/.../where/over/the.rainbow	vmsify	[.some_logical_name_not_likely...where.over]the.rainbow
-/some_logical_name_not_likely/.../where/over/the.rainbow	vmsify	some_logical_name_not_likely:[...where.over]the.rainbow
-some_logical_name_not_likely/where/...	vmsify	[.some_logical_name_not_likely.where...]
-/where/...	vmsify	where:[...]
+/__some_/__where_/__over_/__the_.__rainbow_    vmsify  __some_:[__where_.__over_]__the_.__rainbow_
+__some_/__where_/__over_/__the_.__rainbow_     vmsify  [.__some_.__where_.__over_]__the_.__rainbow_
+../__some_/__where_/__over_/__the_.__rainbow_  vmsify  [-.__some_.__where_.__over_]__the_.__rainbow_
+__some_/../../__where_/__over_/__the_.__rainbow_       vmsify  [-.__where_.__over_]__the_.__rainbow_
+.../__some_/__where_/__over_/__the_.__rainbow_ vmsify  [...__some_.__where_.__over_]__the_.__rainbow_
+__some_/.../__where_/__over_/__the_.__rainbow_ vmsify  [.__some_...__where_.__over_]__the_.__rainbow_
+/__some_/.../__where_/__over_/__the_.__rainbow_        vmsify  __some_:[...__where_.__over_]__the_.__rainbow_
+__some_/__where_/...   vmsify  [.__some_.__where_...]
+/__where_/...  vmsify  __where_:[...]
 .	vmsify	[]
 ..	vmsify	[-]
 ../..	vmsify	[--]
@@ -76,48 +81,52 @@ some_logical_name_not_likely/where/...	vmsify	[.some_logical_name_not_likely.whe
 /	vmsify	sys$disk:[000000]
 
 # Fileifying directory specs
-down_logical_name_not_likely:[the.garden.path]	fileify	down_logical_name_not_likely:[the.garden]path.dir;1
-[.down_logical_name_not_likely.the.garden.path]	fileify	[.down_logical_name_not_likely.the.garden]path.dir;1
-/down_logical_name_not_likely/the/garden/path	fileify	/down_logical_name_not_likely/the/garden/path.dir;1
-/down_logical_name_not_likely/the/garden/path/	fileify	/down_logical_name_not_likely/the/garden/path.dir;1
-down_logical_name_not_likely/the/garden/path	fileify	down_logical_name_not_likely/the/garden/path.dir;1
-down_logical_name_not_likely:[the.garden]path	fileify	down_logical_name_not_likely:[the.garden]path.dir;1
-down_logical_name_not_likely:[the.garden]path.	fileify	# N.B. trailing . ==> null type
-down_logical_name_not_likely:[the]garden.path	fileify	
-/down_logical_name_not_likely/the/garden/path.	fileify	# N.B. trailing . ==> null type
-/down_logical_name_not_likely/the/garden.path	fileify	
+__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 /__down_/__the_/__garden_/__path_.dir;1
+/__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 __down_:[__the_.__garden_]__path_.dir;1
+__down_:[__the_.__garden_]__path_.     fileify # N.B. trailing . ==> null type
+__down_:[__the_]__garden_.__path_      fileify undef
+/__down_/__the_/__garden_/__path_.     fileify # N.B. trailing . ==> null type
+/__down_/__the_/__garden_.__path_      fileify undef
 
 # and pathifying them
-down_logical_name_not_likely:[the.garden]path.dir;1	pathify	down_logical_name_not_likely:[the.garden.path]
-[.down_logical_name_not_likely.the.garden]path.dir	pathify	[.down_logical_name_not_likely.the.garden.path]
-/down_logical_name_not_likely/the/garden/path.dir	pathify	/down_logical_name_not_likely/the/garden/path/
-down_logical_name_not_likely/the/garden/path.dir	pathify	down_logical_name_not_likely/the/garden/path/
-down_logical_name_not_likely:[the.garden]path	pathify	down_logical_name_not_likely:[the.garden.path]
-down_logical_name_not_likely:[the.garden]path.	pathify	# N.B. trailing . ==> null type
-down_logical_name_not_likely:[the]garden.path	pathify	
-/down_logical_name_not_likely/the/garden/path.	pathify	# N.B. trailing . ==> null type
-/down_logical_name_not_likely/the/garden.path	pathify	
-down_logical_name_not_likely:[the.garden]path.dir;2	pathify	#N.B. ;2
-__path	pathify	__path/
-/down_logical_name_not_likely/the/garden/.	pathify	/down_logical_name_not_likely/the/garden/./
-/down_logical_name_not_likely/the/garden/..	pathify	/down_logical_name_not_likely/the/garden/../
-/down_logical_name_not_likely/the/garden/...	pathify	/down_logical_name_not_likely/the/garden/.../
-path.notdir	pathify	
+__down_:[__the_.__garden_]__path_.dir;1        pathify __down_:[__the_.__garden_.__path_]
+[.__down_.__the_.__garden_]__path_.dir pathify [.__down_.__the_.__garden_.__path_]
+/__down_/__the_/__garden_/__path_.dir  pathify /__down_/__the_/__garden_/__path_/
+__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 undef
+/__down_/__the_/__garden_/__path_.     pathify # N.B. trailing . ==> null type
+/__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 undef
 
 # Both VMS/Unix and file/path conversions
-down_logical_name_not_likely:[the.garden]path.dir;1	unixpath	/down_logical_name_not_likely/the/garden/path/
-/down_logical_name_not_likely/the/garden/path	vmspath	down_logical_name_not_likely:[the.garden.path]
-down_logical_name_not_likely:[the.garden.path]	unixpath	/down_logical_name_not_likely/the/garden/path/
-down_logical_name_not_likely:[the.garden.path...]	unixpath	/down_logical_name_not_likely/the/garden/path/.../
-/down_logical_name_not_likely/the/garden/path.dir	vmspath	down_logical_name_not_likely:[the.garden.path]
-[.down_logical_name_not_likely.the.garden]path.dir	unixpath	down_logical_name_not_likely/the/garden/path/
-down_logical_name_not_likely/the/garden/path	vmspath	[.down_logical_name_not_likely.the.garden.path]
-__path	vmspath	[.__path]
+__down_:[__the_.__garden_]__path_.dir;1        unixpath        /__down_/__the_/__garden_/__path_/
+/__down_/__the_/__garden_/__path_      vmspath __down_:[__the_.__garden_.__path_]
+__down_:[__the_.__garden_.__path_]     unixpath        /__down_/__the_/__garden_/__path_/
+__down_:[__the_.__garden_.__path_...]  unixpath        /__down_/__the_/__garden_/__path_/.../
+/__down_/__the_/__garden_/__path_.dir  vmspath __down_:[__the_.__garden_.__path_]
+[.__down_.__the_.__garden_]__path_.dir unixpath        __down_/__the_/__garden_/__path_/
+__down_/__the_/__garden_/__path_       vmspath [.__down_.__the_.__garden_.__path_]
+__path_        vmspath [.__path_]
 /	vmspath	sys$disk:[000000]
 
 # Redundant characters in Unix paths
-//some_logical_name_not_likely/where//over/../the.rainbow	vmsify	some_logical_name_not_likely:[where]the.rainbow
-/some_logical_name_not_likely/where//over/./the.rainbow	vmsify	some_logical_name_not_likely:[where.over]the.rainbow
+//__some_/__where_//__over_/../__the_.__rainbow_       vmsify  __some_:[__where_]__the_.__rainbow_
+/__some_/__where_//__over_/./__the_.__rainbow_ vmsify  __some_:[__where_.__over_]__the_.__rainbow_
 ..//../	vmspath	[--]
 ./././	vmspath	[]
 ./../.	vmsify	[-]
+
+# Our override of File::Spec->canonpath can do some strange things
+__dev:[__dir.000000]__foo     File::Spec->canonpath   __dev:[__dir.000000]__foo
+__dev:[__dir.][000000]__foo   File::Spec->canonpath   __dev:[__dir]__foo