diff --git a/renderdoc/3rdparty/catch/catch.cpp b/renderdoc/3rdparty/catch/catch.cpp index a16f308f3..f0b5a6993 100644 --- a/renderdoc/3rdparty/catch/catch.cpp +++ b/renderdoc/3rdparty/catch/catch.cpp @@ -44,7 +44,20 @@ struct AppVeyorListener : Catch::TestEventListenerBase std::string errorList; double durationInSeconds = 0.0; - virtual bool assertionEnded(Catch::AssertionStats const &assertionStats) + struct TestCase + { + double durationInSeconds; + bool passed; + std::string errorList; + std::string name; + std::string filename; + + std::string MakeJSON(); + }; + + std::vector m_testcases; + + virtual bool assertionEnded(Catch::AssertionStats const &assertionStats) override { Catch::TestEventListenerBase::assertionEnded(assertionStats); @@ -98,27 +111,14 @@ struct AppVeyorListener : Catch::TestEventListenerBase return true; } - struct TestCase - { - double durationInSeconds; - bool passed; - std::string errorList; - std::string name; - std::string filename; - - std::string MakeJSON(); - }; - - std::vector m_testcases; - - virtual void sectionEnded(Catch::SectionStats const §ionStats) + virtual void sectionEnded(Catch::SectionStats const §ionStats) override { durationInSeconds += sectionStats.durationInSeconds; Catch::TestEventListenerBase::sectionEnded(sectionStats); } - virtual void testCaseEnded(Catch::TestCaseStats const &testCaseStats) + virtual void testCaseEnded(Catch::TestCaseStats const &testCaseStats) override { m_testcases.push_back({ durationInSeconds, testCaseStats.totals.assertions.allOk(), errorList,