Better debugging output when a test fails

Printing the output key makes it easier to find the offending test.

1 files changed, 15 insertions, 7 deletions

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 9b6cce6e4..65808d1a5 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -1060,18 +1060,26 @@ std::vector<Test::Result> Text_Based_Test::run()
 
             if(result.tests_failed())
                {
-               if(header.empty())
-                  result.test_note("Test #" + std::to_string(test_cnt) + " failed");
-               else
-                  result.test_note("Test #" + std::to_string(test_cnt) + " " + header + " failed");
+               std::ostringstream oss;
+               oss << "Test # " << test_cnt << " ";
+               if(!header.empty())
+                  oss << header << " ";
+               oss << " failed [Key=" << vars.get_req_str(m_output_key) << "]";
+
+               result.test_note(oss.str());
                }
             results.push_back(result);
             }
          catch(std::exception& e)
             {
-            results.push_back(Test::Result::Failure(header_or_name,
-                                                    "test " + std::to_string(test_cnt) +
-                                                    " failed with exception '" + e.what() + "'"));
+            std::ostringstream oss;
+            oss << "Test # " << test_cnt << " ";
+            if(!header.empty())
+               oss << header << " ";
+            oss << " failed with exception '" << e.what() << "'";
+            oss << " [Key=" << vars.get_req_str(m_output_key) << "]";
+
+            results.push_back(Test::Result::Failure(header_or_name, oss.str()));
             }
 
          if(clear_between_callbacks())