1 files changed, 30 insertions, 9 deletions

diff --git a/boost/test/unit_test_parameters.hpp b/boost/test/unit_test_parameters.hpp
index 0b77f37197..e01bbd7aed 100644
--- a/boost/test/unit_test_parameters.hpp
+++ b/boost/test/unit_test_parameters.hpp
@@ -19,6 +19,9 @@
 #include <boost/test/utils/runtime/argument.hpp>
 #include <boost/make_shared.hpp>
 
+// Boost
+#include <boost/function/function0.hpp>
+
 // STL
 #include <iostream>
 #include <fstream>
@@ -96,24 +99,29 @@ BOOST_TEST_DECL bool save_pattern();
 class stream_holder {
 public:
     // Constructor
-    explicit        stream_holder( std::ostream& default_stream = std::cout)
+    explicit        stream_holder( std::ostream& default_stream = std::cout )
     : m_stream( &default_stream )
     {
     }
 
-    void            setup( const const_string& stream_name )
+    void            setup( const const_string& stream_name,
+                           boost::function<void ()> const &cleaner_callback = boost::function<void ()>() )
     {
         if(stream_name.empty())
             return;
 
-        if( stream_name == "stderr" )
+        if( stream_name == "stderr" ) {
             m_stream = &std::cerr;
-        else if( stream_name == "stdout" )
+            m_cleaner.reset();
+        }
+        else if( stream_name == "stdout" ) {
             m_stream = &std::cout;
+            m_cleaner.reset();
+        }
         else {
-            m_file = boost::make_shared<std::ofstream>();
-            m_file->open( std::string(stream_name.begin(), stream_name.end()).c_str() );
-            m_stream = m_file.get();
+            m_cleaner = boost::make_shared<callback_cleaner>(cleaner_callback);
+            m_cleaner->m_file.open( std::string(stream_name.begin(), stream_name.end()).c_str() );
+            m_stream = &m_cleaner->m_file;
         }
     }
 
@@ -121,9 +129,22 @@ public:
     std::ostream&   ref() const { return *m_stream; }
 
 private:
+    struct callback_cleaner {
+        callback_cleaner(boost::function<void ()> cleaner_callback)
+        : m_cleaner_callback(cleaner_callback)
+        , m_file() {
+        }
+        ~callback_cleaner() {
+            if( m_cleaner_callback )
+                m_cleaner_callback();
+        }
+        boost::function<void ()> m_cleaner_callback;
+        std::ofstream m_file;
+    };
+
     // Data members
-    boost::shared_ptr<std::ofstream>   m_file;
-    std::ostream*   m_stream;
+    boost::shared_ptr<callback_cleaner>   m_cleaner;
+    std::ostream*                         m_stream;
 };
 
 } // namespace runtime_config