ChangeLogTag:Fri Mar 2 20:48:45 UTC 2007 Steve Huston <shuston@riverace.com>

4 files changed, 41 insertions, 8 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 3b67a17edea..a45d1349043 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -2401,11 +2401,11 @@ perl bin/mwc.pl  -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO
       for building on Windows. Building the ACE library is the same as
       for regular Windows platforms, except you choose one of the PharLap
       ETS configurations to build within Visual Studio.
-      For an example of how to build
-      binaries, see the tests directory. The tests_pharlap_msvc.lnk
-      file is a LinkLoc commands file that the ACE tests are built
-      with. It is likely that local sites may need to adjust this file
-      for their target environment.</p><p>
+      For an example of how to build binaries, see the tests directory.
+      The tests_pharlap_msvc.lnk file is a LinkLoc commands file that the
+      ACE tests are built with. It is likely that local sites may need
+      to adjust this file for their target environment.
+      </p><p>
 
       <note>To build ACE for National Instruments' LabVIEW RT, use
       the Pharlap ETS information above, but add the following line to your
@@ -2416,6 +2416,18 @@ perl bin/mwc.pl  -type vc71 -relative ACE_ROOT=C:/ace/ACE_wrappers -relative TAO
       This setting makes the necessary adjustments for LabVIEW's implementation
       of Pharlap ETS.</note>
 
+      <note>By default, the ACE tests log their output/results to the
+      system console on Pharlap ETS. To change this behavior and make the
+      test output log to a file in the <code>log</code> directory under the
+      current working directory while executing, add the following line to
+      your config.h file:
+      <pre>
+      #define ACE_PHARLAP_TESTLOG_TO_FILE
+      </pre>
+      This setting has no affect on TAO tests which always write test output
+      to stdout.
+      </note>
+
 </p></li><li><strong>Mac OS X (10.2.x)</strong><p>
 
         </p><p>ACE builds and runs on Mac OS X 10.2.x, but the following are
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f9855afb4c6..b6d1f9e9383 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,16 @@
+Fri Mar  2 20:48:45 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ACE-INSTALL.html: Improved the description of using Pharlap ETS and
+          described the ACE_PHARLAP_TESTLOG_TO_FILE config setting.
+
+        * ace/config-pharlap.h: Add a IN_CLASSD(i) macro that always reports
+          false. Although Pharlap is supposed to support multicast, the
+          IN_CLASSD macro is only added at WinSock 2.
+
+        * tests/Test_Output.cpp: Allow Pharlap to log to a file by setting
+          ACE_PHARLAP_TESTLOG_TO_FILE in config.h. The default behavior of
+          logging to the system console still stands.
+
 Fri Mar  2 18:18:25 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm:
diff --git a/ACE/ace/config-pharlap.h b/ACE/ace/config-pharlap.h
index 2b019bcadef..e955578fb49 100644
--- a/ACE/ace/config-pharlap.h
+++ b/ACE/ace/config-pharlap.h
@@ -69,5 +69,12 @@
 #define ACE_LACKS_IP_ADD_MEMBERSHIP
 #endif /* ACE_HAS_PHARLAP_RT */
 
+// Although IN_CLASSD is defined in both winsock.h and winsock2.h, it ends
+// up undefined for Pharlap ETS builds. If this is the case, set things up
+// so nothing looks like class D.
+#if !defined (IN_CLASSD)
+#  define IN_CLASSD(i) (0)
+#endif
+
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_PHARLAP_H */
diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp
index 3502fea9e3b..63a03f024df 100644
--- a/ACE/tests/Test_Output.cpp
+++ b/ACE/tests/Test_Output.cpp
@@ -56,7 +56,8 @@ ACE_Test_Output::~ACE_Test_Output (void)
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_HAS_PHARLAP)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && \
+    (!defined (ACE_HAS_PHARLAP) || defined (ACE_PHARLAP_TESTLOG_TO_FILE))
   if (this->output_file_ == log_msg_stream)
     delete this->output_file_;
   // else something else changed the stream and hence should
@@ -80,7 +81,7 @@ ACE_Test_Output::output_file (void)
 int
 ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 {
-#if defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PHARLAP) && !defined (ACE_PHARLAP_TESTLOG_TO_FILE)
   // For PharLap, just send it all to the host console for now - redirect
   // to a file there for saving/analysis.
   EtsSelectConsole(ETS_CO_HOST);
@@ -159,7 +160,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
   ACE_LOG_MSG->msg_ostream (this->output_file_);
-#endif /* ACE_HAS_PHARLAP */
+#endif /* ACE_HAS_PHARLAP && !ACE_PHARLAP_TESTLOG_TO_FILE */
 
   ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER );
   ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);