Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>

        Merged changes from Remedy work branch.

7 files changed, 12 insertions, 56 deletions

diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp
index 739531d009f..c59fe00c576 100644
--- a/ACE/tests/Atomic_Op_Test.cpp
+++ b/ACE/tests/Atomic_Op_Test.cpp
@@ -199,7 +199,7 @@ int test (const ACE_TCHAR* type, int iterations)
   if (foo != 0)
     {
       ++retval;
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Substraction failed\n")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error: Subtraction failed\n")));
     }
 
   return retval;
diff --git a/ACE/tests/Dirent_Test.cpp b/ACE/tests/Dirent_Test.cpp
index 98d1ec3f048..497d2bd8126 100644
--- a/ACE/tests/Dirent_Test.cpp
+++ b/ACE/tests/Dirent_Test.cpp
@@ -31,16 +31,11 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/SString.h"
 
-#if (defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600))
-#  define TEST_DIR "log"
-#  define TEST_ENTRY ".."
+#if defined (ACE_HAS_TCHAR_DIRENT)
+#  define TEST_ENTRY ACE_TEXT ("run_test.lst")
 #else
-#  if defined (ACE_HAS_TCHAR_DIRENT)
-#    define TEST_ENTRY ACE_TEXT ("run_test.lst")
-#  else
-#    define TEST_ENTRY "run_test.lst"
-#  endif /* ACE_HAS_TCHAR_DIRENT */
-#endif /* ACE_VXWORKS < 0x600 */
+#  define TEST_ENTRY "run_test.lst"
+#endif /* ACE_HAS_TCHAR_DIRENT */
 
 // Directory to scan - we need to figure it out based on environment.
 static ACE_TString TestDir;
@@ -219,31 +214,11 @@ dirent_count (const ACE_TCHAR *dir_path,
               int recursion_level)
 {
 #if !defined (ACE_LACKS_CHDIR)
-
-# if (defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600))
-  // VxWorks only allows full paths (incl. device spec if applicable) to be specified
-  ACE_TCHAR full_path[MAXPATHLEN];
-  if (ACE_OS::getcwd (full_path, sizeof(full_path)) == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("getcwd: failed\n")),
-                      -1);
-  if ((ACE_OS::strlen (full_path) + 1 + ACE_OS::strlen (dir_path)) >= sizeof(full_path))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("getcwd: too long\n")),
-                      -1);
-  ACE_OS::strcat (ACE_OS::strcat (full_path, "/"), dir_path);
-  if (ACE_OS::chdir (full_path) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("chdir: %p\n"),
-                       full_path),
-                      -1);
-# else
   if (ACE_OS::chdir (dir_path) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("chdir: %p\n"),
                        dir_path),
                       -1);
-# endif
 #else
   ACE_UNUSED_ARG (dir_path);
 #endif /* !ACE_LACKS_CHDIR */
diff --git a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp
index da1b7ae2ab5..ebae71d365b 100644
--- a/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp
+++ b/ACE/tests/SSL/SSL_Asynch_Stream_Test.cpp
@@ -123,18 +123,11 @@ static const ACE_TCHAR *rendezvous = \
 // Total number of proactor threads.
 static size_t num_threads = ACE_MAX_THREADS;
 
-#if defined (CHORUS) // Add platforms that can't handle too many
-                     // connection simultaneously here.
-#define ACE_LOAD_FACTOR /2
-#else
-#define ACE_LOAD_FACTOR
-#endif
-
 // Number of client connections to attempt.
-static size_t cli_conn_no = ACE_MAX_ITERATIONS ACE_LOAD_FACTOR;
+static size_t cli_conn_no = ACE_MAX_ITERATIONS;
 
 // Number of requests each client connection sends.
-static size_t cli_req_no = ACE_MAX_THREADS ACE_LOAD_FACTOR;
+static size_t cli_req_no = ACE_MAX_THREADS;
 
 // Delay before a thread sending the next request (in msec.)
 static int req_delay = 0;
diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
index 5c2c4117342..94d41c85999 100644
--- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
+++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
@@ -66,21 +66,14 @@ static const ACE_TCHAR *rendezvous = ACE_TEXT ("127.0.0.1:10010");
 // Total number of server threads.
 static size_t svr_thrno = ACE_MAX_THREADS;
 
-#if defined (CHORUS) // Add platforms that can't handle too many
-                     // connection simultaneously here.
-#define ACE_LOAD_FACTOR /2
-#else
-#define ACE_LOAD_FACTOR
-#endif
-
 // Total number of client threads.
-static size_t cli_thrno = ACE_MAX_THREADS ACE_LOAD_FACTOR;
+static size_t cli_thrno = ACE_MAX_THREADS;
 
 // Total connection attemps of a client thread.
-static size_t cli_conn_no = ACE_MAX_ITERATIONS ACE_LOAD_FACTOR;
+static size_t cli_conn_no = ACE_MAX_ITERATIONS;
 
 // Total requests a client thread sends.
-static size_t cli_req_no = ACE_MAX_THREADS ACE_LOAD_FACTOR;
+static size_t cli_req_no = ACE_MAX_THREADS;
 
 // Delay before a thread sending the next request (in msec.)
 static int req_delay = 50;
diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp
index 697b645685d..ba9fb260c15 100644
--- a/ACE/tests/Thread_Manager_Test.cpp
+++ b/ACE/tests/Thread_Manager_Test.cpp
@@ -402,13 +402,8 @@ run_main (int, ACE_TCHAR *[])
   thr_mgr->kill_grp (grp_id,
                      SIGINT);
 #elif !defined (ACE_HAS_PTHREADS_DRAFT4) && !defined(ACE_LACKS_PTHREAD_KILL)
-#if defined (CHORUS)
-  ACE_TEST_ASSERT (thr_mgr->kill_grp (grp_id,
-                                 SIGTHREADKILL) != -1);
-#else
   ACE_TEST_ASSERT (thr_mgr->kill_grp (grp_id,
                                  SIGINT) != -1);
-#endif /* CHORUS */
 #else
   if (thr_mgr->kill_grp (grp_id,
                          SIGINT) == -1)
diff --git a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp
index aae9b72f1a7..36455983a4a 100644
--- a/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp
+++ b/ACE/tests/Thread_Pool_Reactor_Resume_Test.cpp
@@ -63,7 +63,7 @@ static size_t svr_thrno = ACE_MAX_THREADS;
 // Default network parameters (MAX_BINDS and system buffers) are too small
 // for full test on some platforms; add platforms that can't handle too many
 // connection simultaneously here.
-#if defined (CHORUS) || defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP)
+#if defined (ACE_VXWORKS) || defined (ACE_HAS_PHARLAP)
 #define ACE_LOAD_FACTOR /2
 #else
 #define ACE_LOAD_FACTOR
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index a0322a47c8a..a39e4494b8a 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -1834,7 +1834,7 @@ project(SOCK_SEQPACK_SCTP_Test) : acetest {
   }
 }
 
-project(QtReactor Test) : acetest, ace_qtreactor {
+project(QtReactor Test) : acetest, ace_qt4reactor {
   exename   = QtReactor_Test
   MOC_Files {
     QtReactor_Test.h