summaryrefslogtreecommitdiff
path: root/ACE/tests/Test_Output.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/tests/Test_Output.cpp')
-rw-r--r--ACE/tests/Test_Output.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/ACE/tests/Test_Output.cpp b/ACE/tests/Test_Output.cpp
index a886cfed6a3..664b2e5ed90 100644
--- a/ACE/tests/Test_Output.cpp
+++ b/ACE/tests/Test_Output.cpp
@@ -52,8 +52,7 @@ ACE_Test_Output::~ACE_Test_Output ()
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) || defined (ACE_PHARLAP_TESTLOG_TO_FILE))
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
delete this->output_file_;
#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
}
@@ -74,13 +73,6 @@ ACE_Test_Output::output_file ()
int
ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
{
-#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);
- ACE_LOG_MSG->msg_ostream (&cout);
-
-#else
ACE_TCHAR temp[MAXPATHLEN + 1] = { 0 };
// Ignore the error value since the directory may already exist.
const ACE_TCHAR *test_dir = 0;
@@ -151,8 +143,6 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
# endif /* ACE_LACKS_IOSTREAM_TOTALLY */
ACE_LOG_MSG->msg_ostream (this->output_file_, 0);
-#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);