Effectively disabled this for AIX C Set++ - it can't build it.

2 files changed, 45 insertions, 9 deletions

diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp
index 8493d00f1d9..0370f541b0c 100644
--- a/tests/Cached_Accept_Conn_Test.cpp
+++ b/tests/Cached_Accept_Conn_Test.cpp
@@ -26,6 +26,12 @@
 #define CACHED_ACCEPT_CONNECTION_TEST
 
 #include "test_config.h"
+
+// IBM C Set++ just can't grok the templates in here for auto template
+// instantiation. It ends up overwriting a tempinc/*.C file and mashes
+// its contents.
+#if !defined (__xlC__) || (__xlC__ > 0x0301)
+
 #include "Cached_Accept_Conn_Test.h"
 
 #if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
@@ -539,6 +545,22 @@ main (int argc,
     }
 
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
+
+#else   /* Do this for C Set++ 3.1 */
+
+int
+main (int argc,
+      ASYS_TCHAR *argv[])
+{
+  ACE_UNUSED_ARG (argc);
+  ACE_UNUSED_ARG (argv);
+
+  ACE_START_TEST (ASYS_TEXT ("Cached_Accept_Conn_Test"));
+  ACE_ERROR ((LM_INFO,
+              ASYS_TEXT ("C Set++ won't build this test correctly\n")));
+
+#endif /* !__xlC__ || __xlC > 0x0301 */
+
   ACE_END_TEST;
   return 0;
 }
diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp
index caacc7380cf..c440b1b90ca 100644
--- a/tests/Cached_Conn_Test.cpp
+++ b/tests/Cached_Conn_Test.cpp
@@ -25,6 +25,13 @@
 
 #include "test_config.h"
 
+// IBM C Set++ just can't grok the templates in here for auto template
+// instantiation. It ends up overwriting a tempinc/*.C file and mashes
+// its contents.
+#if !defined (__xlC__) || (__xlC__ > 0x0301)
+
+#include "Cached_Conn_Test.h"
+
 #if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
 #define ACE_HAS_BROKEN_EXTENDED_TEMPLATES
 #endif /* __GNUC__ */
@@ -54,15 +61,6 @@ USELIB("..\ace\aced.lib");
 
 static int debug = 0;
 
-class Svc_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-
-  Svc_Handler (ACE_Thread_Manager *t = 0);
-  int open (void *v = 0);
-  int close (u_long flags = 0);
-};
-
 Svc_Handler::Svc_Handler (ACE_Thread_Manager *t)
   : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (t)
 {
@@ -449,6 +447,22 @@ main (int argc,
     }
 
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::VERBOSE_LITE);
+
+#else   /* Do this for C Set++ 3.1 */
+
+int
+main (int argc,
+      ASYS_TCHAR *argv[])
+{
+  ACE_UNUSED_ARG (argc);
+  ACE_UNUSED_ARG (argv);
+
+  ACE_START_TEST (ASYS_TEXT ("Cached_Conn_Test"));
+  ACE_ERROR ((LM_INFO,
+              ASYS_TEXT ("C Set++ won't build this test correctly\n")));
+
+#endif /* !__xlC__ || __xlC > 0x0301 */
+
   ACE_END_TEST;
   return 0;
 }