X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libtest%2Fcollection.cc;h=040dd8b4690ec1c4574454c948b9e9c8c6bd5465;hb=b220134a312e2a488810abfef510f5dbf59078a4;hp=0b2b32492230b3f83c22229291eaeb2fdce1804f;hpb=d234ba4d3903a1284c02d45d86ef816fd696c13a;p=awesomized%2Flibmemcached

diff --git a/libtest/collection.cc b/libtest/collection.cc
index 0b2b3249..040dd8b4 100644
--- a/libtest/collection.cc
+++ b/libtest/collection.cc
@@ -140,7 +140,20 @@ test_return_t Collection::exec()
       {
         _failed++;
         formatter()->failed();
-        stream::make_cerr(e.file(), e.line(), e.func()) << e.what();
+        stream::make_cerr err(e.file(), e.line(), e.func());
+        err << e.what();
+        for (auto server : _frame->servers().servers)
+        {
+          auto output = server->output();
+          if (output.first.size())
+          {
+            err << "Server stdout:\n" << output.first << "\n";
+          }
+          if (output.second.size())
+          {
+            err << "Server stderr:\n" << output.second << "\n";
+          }
+        }
         throw;
       }
 
@@ -154,6 +167,18 @@ test_return_t Collection::exec()
       case TEST_FAILURE:
         _failed++;
         formatter()->failed();
+        for (auto server : _frame->servers().servers)
+        {
+          auto output = server->output();
+          if (output.first.size())
+          {
+            Out << "Server stdout:\n" << output.first << "\n";
+          }
+          if (output.second.size())
+          {
+            Out << "Server stderr:\n" << output.second << "\n";
+          }
+        }
         break;
 
       case TEST_SKIPPED: