From ec11c8924d9932031b91557670b452a4d42cb91e Mon Sep 17 00:00:00 2001
From: Rhodri James <rhodri@kynesim.co.uk>
Date: Thu, 27 Jul 2017 13:49:22 +0100
Subject: [PATCH] Make test_alloc_public_notation() robust vs allocation
 pattern changes

---
 expat/tests/runtests.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 0ef00280..c2cd11de 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -9264,23 +9264,18 @@ START_TEST(test_alloc_public_notation)
         "<!ELEMENT doc EMPTY>\n"
         "]>\n<doc/>";
     int i;
-#define MAX_ALLOC_COUNT 10
-    int repeat = 0;
+#define MAX_ALLOC_COUNT 20
 
     for (i = 0; i < MAX_ALLOC_COUNT; i++) {
-        /* Repeat some counts to allow for cached allocations */
-        if ((i == 2 && repeat < 5) ||
-            (i == 3 && repeat == 5)) {
-            i--;
-            repeat++;
-        }
         allocation_count = i;
         dummy_handler_flags = 0;
         XML_SetNotationDeclHandler(parser, dummy_notation_decl_handler);
         if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text),
                                     XML_TRUE) != XML_STATUS_ERROR)
             break;
-        XML_ParserReset(parser, NULL);
+        /* See comment in test_alloc_parse_xdecl() */
+        alloc_teardown();
+        alloc_setup();
     }
     if (i == 0)
         fail("Parse succeeded despite allocation failures");