diff options
| author | Steve Huston <shuston@riverace.com> | 2007-03-02 20:50:51 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-03-02 20:50:51 +0000 |
| commit | 1ea821a4d7769c1adb4e743f1b325170a26d9064 (patch) | |
| tree | 68a19dbd2643dc447338dc6177fcd098b6761d11 /ACE/tests/Test_Output.cpp | |
| parent | 84f2a1bd43a2a4d62ddd445cac541b1de573c0df (diff) | |
| download | ATCD-1ea821a4d7769c1adb4e743f1b325170a26d9064.tar.gz | |
ChangeLogTag:Fri Mar 2 20:48:45 UTC 2007 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/tests/Test_Output.cpp')
| -rw-r--r-- | ACE/tests/Test_Output.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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); |