[perl-xml-cvs] CVS: xml-simple/t 1_XMLin.t,1.21,1.22 3_Storable.t,1.9,1.10 4_MemShare.t,1.4,1.5 5_MemCopy.t,1.5,1.6 7_SaxStuff.t,1.4,1.5

[Grant M. <gr...@us...>]

Update of /cvsroot/perl-xml/xml-simple/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19481/t

Modified Files:
	1_XMLin.t 3_Storable.t 4_MemShare.t 5_MemCopy.t 7_SaxStuff.t 
Log Message:
- VMS unlink fixes (patch from Peter (Stig) Edwards)

Index: 1_XMLin.t
===================================================================
RCS file: /cvsroot/perl-xml/xml-simple/t/1_XMLin.t,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- 1_XMLin.t	17 Nov 2004 09:01:01 -0000	1.21
+++ 1_XMLin.t	29 Jan 2005 04:17:42 -0000	1.22
@@ -25,8 +25,8 @@
 $@ = '';
 eval "use XML::Simple;";
 is($@, '', 'Module compiled OK');
-unless($XML::Simple::VERSION eq '2.13') {
-  diag("Warning: XML::Simple::VERSION = $XML::Simple::VERSION (expected 2.13)");
+unless($XML::Simple::VERSION eq '2.14') {
+  diag("Warning: XML::Simple::VERSION = $XML::Simple::VERSION (expected 2.14)");
 }
 
 

Index: 3_Storable.t
===================================================================
RCS file: /cvsroot/perl-xml/xml-simple/t/3_Storable.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- 3_Storable.t	29 Feb 2004 09:49:18 -0000	1.9
+++ 3_Storable.t	29 Jan 2005 04:17:42 -0000	1.10
@@ -146,7 +146,11 @@
 $t2 = (stat($CacheFile))[9];
 isnt($t1, $t2, 'and this time the cache timestamp has changed');
 
-unlink($XMLFile);
+if ('VMS' eq $^O) {
+  1 while (unlink($XMLFile));
+} else {
+  unlink($XMLFile);
+}
 ok(! -e $XMLFile, 'deleted the cache file');
 open(FILE, ">$XMLFile");              # Re-create it (empty)
 close(FILE);

Index: 4_MemShare.t
===================================================================
RCS file: /cvsroot/perl-xml/xml-simple/t/4_MemShare.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 4_MemShare.t	18 May 2003 08:43:13 -0000	1.4
+++ 4_MemShare.t	29 Jan 2005 04:17:42 -0000	1.5
@@ -113,7 +113,11 @@
 my $opt = XMLin($XMLFile, cache => 'memshare');
 is_deeply($opt, $Expected, 'parsed expected data from file');
 
-unlink($XMLFile);
+if ('VMS' eq $^O) {
+  1 while (unlink($XMLFile));
+} else {
+  unlink($XMLFile);
+}
 ok(! -e $XMLFile, 'deleted the XML source file');
 open(FILE, ">$XMLFile");              # Re-create it (empty)
 close(FILE);

Index: 5_MemCopy.t
===================================================================
RCS file: /cvsroot/perl-xml/xml-simple/t/5_MemCopy.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 5_MemCopy.t	18 May 2003 08:43:13 -0000	1.5
+++ 5_MemCopy.t	29 Jan 2005 04:17:42 -0000	1.6
@@ -117,7 +117,11 @@
 my $opt = XMLin($XMLFile, cache => 'memcopy');
 is_deeply($opt, $Expected, 'parsed expected data through the cache');
 
-unlink($XMLFile);
+if ('VMS' eq $^O) {
+  1 while (unlink($XMLFile));
+} else {
+  unlink($XMLFile);
+}
 ok(! -e $XMLFile, 'deleted the source XML file');
 open(FILE, ">$XMLFile");              # Re-create it (empty)
 close(FILE);

Index: 7_SaxStuff.t
===================================================================
RCS file: /cvsroot/perl-xml/xml-simple/t/7_SaxStuff.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 7_SaxStuff.t	29 Feb 2004 09:49:18 -0000	1.4
+++ 7_SaxStuff.t	29 Jan 2005 04:17:42 -0000	1.5
@@ -101,7 +101,11 @@
 $XML::Simple::PREFERRED_PARSER = '';
 
 ok(CopyFile($SrcFile, $XMLFile), 'created source XML file');
-unlink($CacheFile);
+if ('VMS' eq $^O) {
+  1 while (unlink($CacheFile));
+} else {
+  unlink($CacheFile);
+}
 ok(! -e $CacheFile, 'deleted old cache files');
 
 # Pass in a filename to check parse_uri()