3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix OutputFileRedirector destructor ordering.

Browse Source
This commit is contained in:
davidmatson 2022-09-20 15:18:28 -07:00
parent 10459a76f7
commit a560a9f827
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/catch2/internal/catch_output_redirect.cpp
View File

@ -228,16 +228,16 @@ namespace Catch {
} }
OutputFileRedirector::~OutputFileRedirector() noexcept { OutputFileRedirector::~OutputFileRedirector() noexcept {
if ( m_readThread.joinable() ) {
m_readThread.join();
}
fflush_or_throw( fflush_or_throw(
m_file ); // std::terminate on failure (due to noexcept) m_file ); // std::terminate on failure (due to noexcept)
// Restore the original stdout or stderr file descriptor. // Restore the original stdout or stderr file descriptor.
dup2_or_throw( m_previous.get(), dup2_or_throw( m_previous.get(),
m_fd ); // std::terminate on failure (due to noexcept) m_fd ); // std::terminate on failure (due to noexcept)
if ( m_readThread.joinable() ) {
m_readThread.join();
}
} }
OutputRedirect::OutputRedirect( std::string& output, std::string& error ): OutputRedirect::OutputRedirect( std::string& output, std::string& error ):