ChangeLogTag:Tue Oct 9 23:33:27 UTC 2007 Steve Huston <shuston@riverace.com>

7 files changed, 65 insertions, 26 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 5766b313e96..ff56d6bcbd4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Tue Oct  9 23:33:27 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * bin/ace_tests.lst: Disable WFMO tests and HTBP tests on LabVIEW_RT.
+          LabVIEW_RT lacks Winsock 2 stuff needed for the WMFO tests, and the
+          HTBP test scripts aren't converted to work on LabVIEW RT.
+
+        * tests/MT_Reactor_Upcall_Test.cpp:
+        * tests/Reactor_Dispatch_Order_Test.cpp:
+        * tests/Reactor_Registration_Test.cpp: Test ACE_WFMO_Reactor if
+          ACE_HAS_WINSOCK2 != 0, not if == 0.
+
+        * tests/Sendfile_Test.cpp: Remove ACE_ASSERTs; correct some logging.
+
+        * tests/run_test.lst: Disable Env_Value_Test, Dirent_Test, and
+          Multicast_Test on LabVIEW RT. LabVIEW_RT doesn't have env variables,
+          the Dirent_Test expects too much of the build machine's directory
+          structure to be available, and LabVIEW_RT lacks Winsock 2 and mcast.
+
 Mon Oct  8 17:59:15 UTC 2007  Ossama Othman  <ossama_othman at symantec dot com>
 
         * ace/Atomic_Op_T.h:
diff --git a/ACE/bin/ace_tests.lst b/ACE/bin/ace_tests.lst
index 7d01951d346..340782ab47f 100644
--- a/ACE/bin/ace_tests.lst
+++ b/ACE/bin/ace_tests.lst
@@ -10,9 +10,9 @@
 # NOTE: This file contains tests only for ACE. Please do not include
 # tests in TAO here..
 tests/run_test.pl
-examples/Reactor/WFMO_Reactor/run_test.pl: !Cygwin !VxWorks !ACE_FOR_TAO
-protocols/tests/RMCast/run_test.pl: RMCAST !ST !NO_MCAST !nsk !LynxOS !ACE_FOR_TAO !VxWorks
-protocols/tests/HTBP/ping/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks
-protocols/tests/HTBP/Send_Recv_Tests/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks
-protocols/tests/HTBP/Send_Large_Msg/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks
-protocols/tests/HTBP/Reactor_Tests/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks
+examples/Reactor/WFMO_Reactor/run_test.pl: !Cygwin !VxWorks !ACE_FOR_TAO !LabVIEW_RT
+protocols/tests/RMCast/run_test.pl: RMCAST !ST !NO_MCAST !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT
+protocols/tests/HTBP/ping/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT
+protocols/tests/HTBP/Send_Recv_Tests/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT
+protocols/tests/HTBP/Send_Large_Msg/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT
+protocols/tests/HTBP/Reactor_Tests/run_test.pl: !NO_UUID !nsk !LynxOS !ACE_FOR_TAO !VxWorks !LabVIEW_RT
diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp
index bfe80baf650..e446707dbdc 100644
--- a/ACE/tests/MT_Reactor_Upcall_Test.cpp
+++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp
@@ -359,7 +359,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 #endif /* ACE_HAS_EVENT_POLL */
 
 #if defined (ACE_WIN32) && \
-    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0))
+    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing WFMO Reactor\n")));
 
diff --git a/ACE/tests/Reactor_Dispatch_Order_Test.cpp b/ACE/tests/Reactor_Dispatch_Order_Test.cpp
index 30927b327cd..6c700ffb043 100644
--- a/ACE/tests/Reactor_Dispatch_Order_Test.cpp
+++ b/ACE/tests/Reactor_Dispatch_Order_Test.cpp
@@ -209,7 +209,7 @@ run_main (int, ACE_TCHAR *[])
 
   // Winsock 2 things are needed for WFMO_Reactor.
 #if defined (ACE_WIN32) && \
-    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0))
+    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
 
   ACE_WFMO_Reactor wfmo_reactor_impl;
   ACE_Reactor wfmo_reactor (&wfmo_reactor_impl);
diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp
index d4ee32df593..2e3aaf08cb9 100644
--- a/ACE/tests/Reactor_Registration_Test.cpp
+++ b/ACE/tests/Reactor_Registration_Test.cpp
@@ -191,7 +191,7 @@ run_main (int, ACE_TCHAR *[])
 
   // The ACE_WFMO_Reactor stuff needs Winsock2
 #if defined (ACE_WIN32) && \
-    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 == 0))
+    (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   iteration = 1;
   ACE_WFMO_Reactor wfmo_reactor;
   test (wfmo_reactor, "ACE_WFMO_Reactor");
diff --git a/ACE/tests/Sendfile_Test.cpp b/ACE/tests/Sendfile_Test.cpp
index fe0d03d6fd4..74f1bab1781 100644
--- a/ACE/tests/Sendfile_Test.cpp
+++ b/ACE/tests/Sendfile_Test.cpp
@@ -91,18 +91,28 @@ client (void *arg)
                   O_CREAT | O_RDWR | O_TRUNC,
                   ACE_DEFAULT_FILE_PERMS);
 
-  ACE_ASSERT (in_fd != ACE_INVALID_HANDLE);
+  if (in_fd == ACE_INVALID_HANDLE)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) open %p\n"), test_file));
+      Test_Result = 1;
+      goto cleanup;
+    }
 
   ACE_OS::unlink (test_file);
 
   ssize_t const byte_count =
     ACE_OS::write (in_fd, buffer, sizeof (buffer));
 
-  ACE_ASSERT (byte_count == static_cast<ssize_t> (sizeof (buffer)));
+  if (byte_count != static_cast<ssize_t> (sizeof (buffer)))
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) write %p\n"), test_file));
+      Test_Result = 1;
+      goto cleanup;
+    }
 
   off_t offset = 0;
 
-   ssize_t len =
+  ssize_t len =
      ACE_OS::sendfile (cli_stream.get_handle (),
                        in_fd,
                        &offset,
@@ -116,8 +126,10 @@ client (void *arg)
       Test_Result = 1;
       goto cleanup;
     }
-  else
-    ACE_ASSERT (len == 255);
+  else if (len != 255)
+    ACE_ERROR ((LM_ERROR,
+                ACE_TEXT ("(%P|%t) sendfile len %b; should be 255\n"),
+                len));
 
   //*******************   TEST 2   ******************************
   //
@@ -135,16 +147,15 @@ client (void *arg)
   if (len != 255)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p; len is %d, but should be 255!\n"),
+                  ACE_TEXT ("(%P|%t) recv len is %b, but should be 255!\n"),
                   len));
     }
-  ACE_ASSERT (len == 255);
 
-  for (i = 0; i < 255; i++)
+  for (i = 0; i < static_cast<size_t>(len); i++)
     if (buffer2[i] != buffer[i])
       {
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("(%P|%t) Test 2, rcvd byte %d is %d, not %d\n"),
+                    ACE_TEXT ("(%P|%t) Test 2, rcvd byte %B is %d, not %d\n"),
                     i, buffer2[i], buffer[i]));
         Test_Result = 1;
       }
@@ -199,12 +210,18 @@ server (void *arg)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("Test 1, recvv failed")));
+                  ACE_TEXT ("Test 1, recv failed")));
       Test_Result = 1;
     }
 
-  ACE_ASSERT (len == 255);
-  for (i = 0; i < 255; i++)
+  if (len != 255)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) recv len is %b, but should be 255!\n"),
+                  len));
+    }
+
+  for (i = 0; i < static_cast<int>(len); i++)
     if (buffer[i] != i)
       {
         ACE_ERROR ((LM_ERROR,
@@ -226,8 +243,12 @@ server (void *arg)
                        189,
                        &buffer[231],
                        24);
-  ACE_ASSERT (len == 255);
-
+  if (len != 255)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) send len is %b, but should be 255!\n"),
+                  len));
+    }
 
   sock_str.close();
 
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index dbef70c2691..c424d130829 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -56,11 +56,11 @@ DLL_Test: !Unicos !STATIC !KCC_Linux
 DLList_Test: !ACE_FOR_TAO
 Date_Time_Test: !ACE_FOR_TAO
 Dev_Poll_Reactor_Test: !nsk
-Dirent_Test: !VxWorks_RTP
+Dirent_Test: !VxWorks_RTP !LabVIEW_RT
 Dynamic_Priority_Test
 Dynamic_Test
 Enum_Interfaces_Test: !LynxOS !NO_NETWORK
-Env_Value_Test: !WinCE
+Env_Value_Test: !WinCE !LabVIEW_RT
 FIFO_Test: !ACE_FOR_TAO
 Framework_Component_Test: !STATIC !nsk
 Future_Set_Test: !DISABLE_ToFix_LynxOS_PPC !nsk !ACE_FOR_TAO
@@ -96,7 +96,7 @@ Message_Block_Test: !DISABLE_ToFix_LynxOS_PPC !ACE_FOR_TAO
 Message_Queue_Notifications_Test: !DISABLE_ToFix_LynxOS_PPC
 Message_Queue_Test: !ACE_FOR_TAO
 Message_Queue_Test_Ex: !ACE_FOR_TAO
-Multicast_Test: !ST !NO_MCAST !nsk !LynxOS
+Multicast_Test: !ST !NO_MCAST !nsk !LynxOS !LabVIEW_RT
 Multihomed_INET_Addr_Test: !ACE_FOR_TAO
 Naming_Test: !NO_OTHER !LynxOS !Unicos !VxWorks !nsk !ACE_FOR_TAO !PHARLAP
 Network_Adapters_Test: !DISABLE_ToFix_LynxOS_PPC !DISABLE_ToFix_LynxOS_x86