ChangeLogTag:Fri Jan 29 14:49:37 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

5 files changed, 59 insertions, 11 deletions

diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index 1566b286f24..f5c03d68e4c 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -90,14 +90,39 @@ main (int, ASYS_TCHAR *[])
   errors += check (ASYS_TEXT ("ACE_SIZEOF_LONG_DOUBLE: %u%s"),
                    sizeof (long double), ACE_SIZEOF_LONG_DOUBLE);
 
+// Crays don't have 16-bit quantities, so don't even test for 16-bit values
+#if !defined(_UNICOS)
   errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"),
                    sizeof (ACE_INT16), 2);
   errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"),
                    sizeof (ACE_INT16), 2);
+#else /* ! _UNICOS */
+  // MPP Crays have 32 bit shorts, so we use those for 16 bit quantities
+# if defined(_CRAYMPP)
+  errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"),
+                   sizeof (ACE_INT16), 4);
+  errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"),
+                   sizeof (ACE_INT16), 4);
+# else
+  errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"),
+                   sizeof (ACE_INT16), 8);
+  errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"),
+                   sizeof (ACE_INT16), 8);
+# endif
+#endif /* ! _UNICOS */
+
+// MPP Crays do have 32-bit quantities (short), though vector Crays don't
+#if !defined(_UNICOS) || defined(_CRAYMPP)
   errors += check (ASYS_TEXT ("sizeof (ACE_INT32) is %u%s"),
                    sizeof (ACE_INT32), 4);
   errors += check (ASYS_TEXT ("sizeof (ACE_UINT32) is %u%s"),
                    sizeof (ACE_INT32), 4);
+#else /* ! _UNICOS */
+  errors += check (ASYS_TEXT ("sizeof (ACE_INT32) is %u%s"),
+                   sizeof (ACE_INT32), 8);
+  errors += check (ASYS_TEXT ("sizeof (ACE_UINT32) is %u%s"),
+                   sizeof (ACE_INT32), 8);
+#endif /* ! _UNICOS */
   errors += check (ASYS_TEXT ("sizeof (ACE_UINT64) is %u%s"),
                    sizeof (ACE_UINT64), 8);
 
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index 45875b5483d..cb8a58942af 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -205,5 +205,10 @@ template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
 // The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp.
 #pragma instantiate ACE_Unbounded_Set<ACE_HANDLE>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE>
+# if defined(_CRAYMPP)
+// MPP Cray ACE_HANDLE is 64-bit, defined as int, but ACE_INT32 is short
+// so instantiation in ace/Stats.cpp isn't used in this case
+#pragma instantiate ACE_Node<ACE_HANDLE>
+# endif
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 04a6e84efd3..d3471e10401 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -86,7 +86,13 @@ iterator_test (void)
   // Use queue size from of 32 Kb, instead of the default of 16 Kb
   // (defined by ACE_Message_Queue_Base::DEFAULT_HWM), so that the
   // test runs on machines with 8Kb pagesizes.
+#if !defined(_UNICOS)
   QUEUE queue (32 * 1024);
+#else
+  // this works on the Cray, where BUFSIZ is defined as 32Kb
+  QUEUE queue (ITERATIONS * BUFSIZ - 1);
+#endif
+
   int i;
 
   for (i = 0; i < ITERATIONS; i++)
diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp
index a4efe1967c2..cbc5ee7a35a 100644
--- a/tests/SV_Shared_Memory_Test.cpp
+++ b/tests/SV_Shared_Memory_Test.cpp
@@ -27,7 +27,7 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-#if defined (ACE_HAS_SYSV_IPC)
+#if defined (ACE_HAS_SYSV_IPC) && !defined(ACE_LACKS_SYSV_SHMEM)
 
 // Shared memory allocator (note that this chews up the
 // ACE_DEFAULT_SEM_KEY).  Hide the allocator inside this function so
@@ -131,7 +131,7 @@ main (int, char *[])
 {
   ACE_START_TEST ("SV_Shared_Memory_Test");
 
-#if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK)
+#if defined (ACE_HAS_SYSV_IPC) && !defined (ACE_LACKS_FORK) && !defined(ACE_LACKS_SYSV_SHMEM)
   char *shm = (char *) myallocator ().malloc (27);
 
   switch (ACE_OS::fork ("SV_Shared_Memory_Test.cpp"))
@@ -148,7 +148,7 @@ main (int, char *[])
     }
 #else
   ACE_ERROR ((LM_INFO,
-              "SYSV IPC and fork are not supported on this platform\n"));
+              "SYSV IPC, SYSV SHMEM, or fork are not supported on this platform\n"));
 #endif /* ACE_HAS_SYSV_IPC */
   ACE_END_TEST;
   return 0;
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 33086c9b7ee..e670fed555b 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -85,6 +85,10 @@ if [ -x /bin/uname -a `uname -s` = 'LynxOS' ]; then
   LynxOS=1
 fi
 
+if [ -x /bin/uname -a `uname -s` = 'unicos' ]; then
+  Unicos=1
+fi
+
 ace_version=`head -1 ../VERSION | sed 's/.*version \([0-9.]*\).*/\1/'`
 
 if [ ! "$chorus" ]; then
@@ -107,14 +111,18 @@ run Time_Value_Test                     # tests Time_Value
 run High_Res_Timer_Test                 # tests High_Res_Timer
 run SString_Test                        # tests ACE_CString and ACE_SString
 run Collection_Test                     # tests ACE Collection classes
-test $chorus || test $LynxOS || run Naming_Test # tests ACE_Naming_Context, ACE_WString
+# Naming_Test: UNICOS fails due to feature not supported
+test $chorus || test $LynxOS || test $Unicos || run Naming_Test # tests ACE_Naming_Context, ACE_WString
 
 run Handle_Set_Test                     # tests ACE_Handle_Set
 run OrdMultiSet_Test                    # tests ACE_Ordered_MultiSet
-test $chorus || run Mem_Map_Test        # tests ACE_Mem_Map
+# Mem_Map_Test: UNICOS fails due to feature not supported
+test $chorus || test $Unicos || run Mem_Map_Test        # tests ACE_Mem_Map
 
-run SV_Shared_Memory_Test               # tests ACE_SV_Shared_Memory, fork
-test $chorus || run MM_Shared_Memory_Test # tests ACE_Shared_Memory_MM
+# SV_Shared_Memory_Test: UNICOS fails due to feature not supported
+test $Unicos || run SV_Shared_Memory_Test               # tests ACE_SV_Shared_Memory, fork
+# MM_Shared_Memory_Test: UNICOS fails due to feature not supported
+test $chorus || test $Unicos || run MM_Shared_Memory_Test # tests ACE_Shared_Memory_MM
 
 run Sigset_Ops_Test                     # tests ACE_sigset*() functions
 
@@ -124,7 +132,8 @@ run MT_Reactor_Timer_Test               # tests ACE_Reactor's timer mechanism.
 run SOCK_Connector_Test                 # tests ACE_SOCK_Connector
 
 run Task_Test                           # tests ACE_Thread_Manager, ACE_Task
-run Thread_Manager_Test                 # tests ACE_Thread_Manager, ACE_Task
+# Thread_Manager_Test: UNICOS fails due to no pthread_kill nor pthread_cancel
+test $Unicos || run Thread_Manager_Test                 # tests ACE_Thread_Manager, ACE_Task
 run Thread_Pool_Test                    # tests ACE_Thread_Manager, ACE_Task
 run Future_Test                         # tests ACE_Thread_Manager, ACE_Task
 run RB_Tree_Test                        # tests ACE_RB_Tree, ACE_RB_Tree_Iterator
@@ -150,10 +159,12 @@ run Priority_Buffer_Test                # tests ACE_Service_Config, ACE_Message_
 run Dynamic_Priority_Test               # tests ACE_ACE_Message_Queue, ACE_Dynamic_Message_Queue
 run Recursive_Mutex_Test                # tests ACE_Service_Config, ACE_Recursive_Thread_Mutex
 
+# Time_Service_Test: UNICOS fails dlopen() - no shared libs on UNICOS
 if [ -f ../netsvcs/server/main ]; then
-  test $chorus || test $LynxOS || run Time_Service_Test # tests libnetsvcs
+  test $chorus || test $LynxOS || test $Unicos || run Time_Service_Test # tests libnetsvcs
 fi
-test $chorus || test $LynxOS || run Tokens_Test # tests ACE_Token
+# Tokens_Test: UNICOS fails dlopen() - no shared libs on UNICOS
+test $chorus || test $LynxOS || test $Unicos || run Tokens_Test # tests ACE_Token
 
 run Map_Manager_Test                    # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators.
 run Message_Queue_Notifications_Test    # tests ACE_Message_Queue + ACE_Reactor
@@ -165,7 +176,8 @@ test $chorus || run Process_Mutex_Test  # tests ACE_Process_Mutex
 test $chorus || run Thread_Mutex_Test   # tests ACE_Thread_Process_Mutex
 test $chorus || run Process_Strategy_Test # tests ACE_ACE_Strategy_Acceptor
 run Service_Config_Test                 # tests ACE_Service_Config
-run Priority_Task_Test                  # tests ACE_Task with priorities
+# Priority_Task_Test: UNICOS fails due to getprio - feature not supported
+test $Unicos || run Priority_Task_Test                  # tests ACE_Task with priorities
 run IOStream_Test                       # tests ACE_IOStream and ACE_SOCK_Stream
 run Enum_Interfaces_Test                # tests ACE_ACE::get_ip_interfaces()
 test $chorus || run Upgradable_RW_Test  # tests ACE_RW locks