ChangeLogTag: Mon Aug 20 11:00:50 2001 Chad Elliott <elliott_c@ociweb.com>

7 files changed, 66 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index ce77c52ebd0..cdcc39953db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Mon Aug 20 11:00:50 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS.h:
+
+          Set the ACE_DEFAULT_FILE_PERMS to the correct value for VxWorks.
+
+        * tests/run_test.lst:
+
+          Removed tests for VxWorks for which the platform has no support.
+
+        * tests/CDR_File_Test.cpp:
+        * tests/Svc_Handler_Test.cpp:
+
+          Add VxWorks to the list of platforms that can't unlink the file
+          in advance of the test completing.
+
 Mon Aug 20 01:49:12 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
 
         * include/makeinclude/build_dll.bor:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ce77c52ebd0..cdcc39953db 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Mon Aug 20 11:00:50 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS.h:
+
+          Set the ACE_DEFAULT_FILE_PERMS to the correct value for VxWorks.
+
+        * tests/run_test.lst:
+
+          Removed tests for VxWorks for which the platform has no support.
+
+        * tests/CDR_File_Test.cpp:
+        * tests/Svc_Handler_Test.cpp:
+
+          Add VxWorks to the list of platforms that can't unlink the file
+          in advance of the test completing.
+
 Mon Aug 20 01:49:12 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
 
         * include/makeinclude/build_dll.bor:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ce77c52ebd0..cdcc39953db 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,19 @@
+Mon Aug 20 11:00:50 2001  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/OS.h:
+
+          Set the ACE_DEFAULT_FILE_PERMS to the correct value for VxWorks.
+
+        * tests/run_test.lst:
+
+          Removed tests for VxWorks for which the platform has no support.
+
+        * tests/CDR_File_Test.cpp:
+        * tests/Svc_Handler_Test.cpp:
+
+          Add VxWorks to the list of platforms that can't unlink the file
+          in advance of the test completing.
+
 Mon Aug 20 01:49:12 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
 
         * include/makeinclude/build_dll.bor:
diff --git a/ace/OS.h b/ace/OS.h
index 9f6e27c0bdf..dca4b41b1d4 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -326,6 +326,8 @@ typedef long      id_t;
 #     else
 #       define ACE_DEFAULT_FILE_PERMS (FILE_SHARE_READ | FILE_SHARE_WRITE)
 #     endif /* ACE_HAS_WINNT4 */
+#   elif defined (VXWORKS)
+#     define ACE_DEFAULT_FILE_PERMS (S_IRUSR | S_IWUSR| S_IRGRP| S_IROTH)
 #   else
 #     define ACE_DEFAULT_FILE_PERMS 0644
 #   endif /* ACE_WIN32 */
diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp
index 9100a1c31bc..08c31941498 100644
--- a/tests/CDR_File_Test.cpp
+++ b/tests/CDR_File_Test.cpp
@@ -355,8 +355,9 @@ main (int argc, ACE_TCHAR *argv[])
                        filename.get_path_name ()),
                       1);
 
-#if !defined (ACE_WIN32) \
-    || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)
+#if (!defined (ACE_WIN32) \
+     || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)) && \
+    !defined (VXWORKS)
 # define TEST_CAN_UNLINK_IN_ADVANCE
 #endif
 
diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp
index a6c4b64a3ae..0c46f5c9f15 100644
--- a/tests/Svc_Handler_Test.cpp
+++ b/tests/Svc_Handler_Test.cpp
@@ -98,8 +98,9 @@ main (int argc, ACE_TCHAR *argv[])
                          file.get_path_name ()),
                         1);
 
-#if !defined (ACE_WIN32) \
-    || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)
+#if (!defined (ACE_WIN32) \
+     || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 == 1)) && \
+    !defined (VXWORKS)
 # define TEST_CAN_UNLINK_IN_ADVANCE
 #endif
 
diff --git a/tests/run_test.lst b/tests/run_test.lst
index c49d820b114..c9965ecee0e 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -31,7 +31,7 @@ CDR_Array_Test
 Collection_Test
 Config_Test
 Conn_Test: !chorus !VxWorks
-Dirent_Test: !VxWorks
+Dirent_Test
 DLL_Test: !Unicos !STATIC !KCC_Linux
 DLList_Test
 Dynamic_Priority_Test
@@ -51,28 +51,28 @@ Map_Manager_Test
 Map_Test
 Max_Default_Port_Test: !ST
 MEM_Stream_Test: !VxWorks
-Mem_Map_Test: !chorus !Unicos
+Mem_Map_Test: !chorus !Unicos !VxWorks
 Message_Block_Test: !chorus
 Message_Queue_Notifications_Test
 Message_Queue_Test: !chorus
 Message_Queue_Test_Ex: !chorus
-MM_Shared_Memory_Test: !chorus !Unicos
+MM_Shared_Memory_Test: !chorus !Unicos !VxWorks
 MT_Reactor_Timer_Test: !VxWorks
 MT_SOCK_Test: !chorus
-Malloc_Test
+Malloc_Test: !VxWorks
 Naming_Test: OTHER !chorus !LynxOS !Unicos !VxWorks
 New_Fail_Test: ALL !DISABLED
 Notify_Performance_Test
 Object_Manager_Test
 OrdMultiSet_Test
 OS_Test
-Pipe_Test: !MSVC !chorus
+Pipe_Test: !MSVC !chorus !VxWorks
 Priority_Buffer_Test: !VxWorks
 Priority_Reactor_Test: !chorus !VxWorks
 Priority_Task_Test: !Unicos
 Process_Manager_Test: ALL MSVC !DISABLED
-Process_Mutex_Test: !MSVC !chorus
-Process_Strategy_Test: !chorus !LynxOS
+Process_Mutex_Test: !MSVC !chorus !VxWorks
+Process_Strategy_Test: !chorus !LynxOS !VxWorks
 RB_Tree_Test
 Reactors_Test
 Reactor_Exceptions_Test
@@ -91,9 +91,9 @@ Svc_Handler_Test
 SOCK_Test: !chorus
 SOCK_Connector_Test
 SOCK_Send_Recv_Test: !LynxOS
-SPIPE_Test
+SPIPE_Test: !VxWorks
 SString_Test
-SV_Shared_Memory_Test: !MSVC !Unicos
+SV_Shared_Memory_Test: !MSVC !Unicos !VxWorks
 Task_Test
 Thread_Manager_Test: !Unicos
 Thread_Mutex_Test: !chorus
@@ -106,5 +106,5 @@ Time_Service_Test: ALL !STATIC !DISABLED !missing_netsvcs TOKEN !chorus !Unicos
 Time_Value_Test
 Tokens_Test: ALL MSVC !DISABLED TOKEN !chorus !Unicos
 TSS_Test
-UPIPE_SAP_Test
+UPIPE_SAP_Test: !VxWorks
 Upgradable_RW_Test: !chorus