This commit was manufactured by cvs2svn to create tagfix_bug132_iter04_fin

'fix_bug132_iter04_fin'.

1 files changed, 4 insertions, 24 deletions

diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index 49ae77be57a..010ae8683c6 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -341,7 +341,6 @@ main (int argc, ACE_TCHAR *argv[])
       filename.set (fn);
     }
 
-
   ACE_FILE_Connector connector;
   ACE_FILE_IO file;
 
@@ -353,17 +352,11 @@ main (int argc, ACE_TCHAR *argv[])
                          0,
                          ((writing) ? (O_RDWR | O_CREAT) : O_RDONLY),
                          ACE_DEFAULT_FILE_PERMS) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("connect failed for %p\n"),
-                       filename.get_path_name ()),
-                      1);
-
-#if !defined (ACE_WIN32) \
-    || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)
-# define TEST_CAN_UNLINK_IN_ADVANCE
-#endif
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("connect failed for %p\n"),
+                         filename.get_path_name ()),
+                        1);
 
-#if defined(TEST_CAN_UNLINK_IN_ADVANCE)
   if (fn == 0)
     {
       // Unlink this file right away so that it is automatically removed
@@ -374,7 +367,6 @@ main (int argc, ACE_TCHAR *argv[])
                            filename.get_path_name ()),
                           1);
     }
-#endif
 
   CDR_Test cdr_test ('a',
                      0x00ff,
@@ -401,18 +393,6 @@ main (int argc, ACE_TCHAR *argv[])
                 cdr_test);
     }
 
-#if !defined (TEST_CAN_UNLINK_IN_ADVANCE)
-  if (fn == 0)
-    {
-      file.close ();
-      if (file.unlink () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("unlink failed for %p\n"),
-                           filename.get_path_name ()),
-                          1);
-    }
-#endif
-
   ACE_END_TEST;
   return 0;
 }