Make test_nsalloc_long_systemid_in_ext() robust

Makes test more predictable in the face of changing memory
allocation patterns in the library.
This commit is contained in:
Rhodri James 2017-07-26 18:18:46 +01:00
parent 3871e6dc4b
commit 69e781f06d

View File

@ -11838,23 +11838,9 @@ START_TEST(test_nsalloc_long_systemid_in_ext)
{ NULL, NULL }
};
int i;
#define MAX_ALLOC_COUNT 30
int repeat = 0;
#define MAX_ALLOC_COUNT 55
for (i = 0; i < MAX_ALLOC_COUNT; i++) {
/* Repeat some counts to allow for cached allocations */
if ((i == 4 && repeat == 3) || (i == 10 && repeat == 8)) {
i -= 2;
repeat++;
}
else if ((i == 2 && repeat < 2) ||
(i == 3 && (repeat == 2 || repeat == 4 || repeat == 5)) ||
(i == 4 && repeat == 6) ||
(i == 5 && repeat == 7) ||
(i == 9 && repeat == 8)) {
i--;
repeat++;
}
allocation_count = i;
XML_SetUserData(parser, options);
XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);
@ -11863,8 +11849,9 @@ START_TEST(test_nsalloc_long_systemid_in_ext)
XML_TRUE) != XML_STATUS_ERROR)
break;
XML_ParserFree(parser);
parser = XML_ParserCreate(NULL);
/* See comment in test_nsalloc_xmlns() */
nsalloc_teardown();
nsalloc_setup();
}
if (i == 0)
fail("Parsing worked despite failing allocations");