From: Rhodri James <rhodri@kynesim.co.uk>
Date: Thu, 27 Jul 2017 13:25:27 +0000 (+0100)
Subject: Make test_alloc_long_doc_name() robust vs allocation pattern changes
X-Git-Tag: R_2_2_3~16^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7ae0fc8049a147050db93d425232700b4d445a0;p=libexpat

Make test_alloc_long_doc_name() robust vs allocation pattern changes
---

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 4de92514..da08a39f 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -9947,21 +9947,16 @@ START_TEST(test_alloc_long_doc_name)
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789AZ"
         " a='1'/>";
     int i;
-#define MAX_ALLOC_COUNT 10
-    int repeat = 0;
+#define MAX_ALLOC_COUNT 20
 
     for (i = 0; i < MAX_ALLOC_COUNT; i++) {
-        /* Repeat certain counts to defeat cached allocations */
-        if ((i == 2 && repeat < 4) ||
-            (i == 3 && repeat < 6)) {
-            i--;
-            repeat++;
-        }
         allocation_count = i;
         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("Parsing worked despite failing reallocations");