Only call subcase_end currentSubcaseDepth times

Fix doctest#803, presumably broken since doctest#598
patstew · Sep 7, 2023 · 57c2840 · 57c2840
1 parent 66ff54a
commit 57c2840
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doctest/doctest.h b/doctest/doctest.h
@@ -4885,10 +4885,10 @@ namespace {
 
         DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, {message.c_str(), true});
 
-        while (g_cs->subcaseStack.size()) {
-            g_cs->subcaseStack.pop_back();
+        for(size_t i = 0; i < g_cs->currentSubcaseDepth; i++) {
             DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
         }
+        g_cs->subcaseStack.clear();
 
         g_cs->finalizeTestCaseData();
 

diff --git a/doctest/parts/doctest.cpp b/doctest/parts/doctest.cpp
@@ -1795,10 +1795,10 @@ namespace {
 
         DOCTEST_ITERATE_THROUGH_REPORTERS(test_case_exception, {message.c_str(), true});
 
-        while (g_cs->subcaseStack.size()) {
-            g_cs->subcaseStack.pop_back();
+        for(size_t i = 0; i < g_cs->currentSubcaseDepth; i++) {
             DOCTEST_ITERATE_THROUGH_REPORTERS(subcase_end, DOCTEST_EMPTY);
         }
+        g_cs->subcaseStack.clear();
 
         g_cs->finalizeTestCaseData();