From 001795e29899368728dcc969377a862c66a886f6 Mon Sep 17 00:00:00 2001 From: Rhodri James Date: Thu, 27 Jul 2017 12:05:58 +0100 Subject: [PATCH] Make test_alloc_parse_pi() robust vs allocation pattern changes --- expat/tests/runtests.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 51930cb0..d20d6d1c 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7943,25 +7943,17 @@ START_TEST(test_alloc_parse_pi) "Hello, world" ""; 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"); -- 2.40.0