commit 001795e29899368728dcc969377a862c66a886f6
author Rhodri James <rhodri@kynesim.co.uk> Thu Jul 27 12:05:58 2017 +0100
committer Rhodri James <rhodri@kynesim.co.uk> Thu Jul 27 12:05:58 2017 +0100
tree 1b3d79d27f2ebc0bddd84d2cf8ea9d34a6cd9c7b
parent d16a5818493252b6c26833ecbc007447f23ace4c

Make test_alloc_parse_pi() robust vs allocation pattern changes

expat/tests/runtests.c

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 51930cb..d20d6d1 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7943,25 +7943,17 @@
         "Hello, world"
         "</doc>";
     int i;
-    int repeat = 0;
-#define MAX_ALLOC_COUNT 10
+#define MAX_ALLOC_COUNT 15
 
     for (i = 0; i < MAX_ALLOC_COUNT; i++) {
         allocation_count = i;
-        /* Repeat some counts because of cached memory */
-        if (i == 2 && repeat == 2) {
-            i -= 2;
-            repeat++;
-        } else if ((i == 1 && repeat < 2) ||
-                   (i == 1 && repeat > 2 && repeat < 5)) {
-            i--;
-            repeat++;
-        }
         XML_SetProcessingInstructionHandler(parser, dummy_pi_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 failing allocator");