emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delete results properly in parser test macros

Browse source
This commit is contained in:
Sven M. Hallberg 2015-12-01 17:47:37 +01:00
parent 22b5611cdf
commit e89d9f9134
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/test_suite.h
View file

@ -78,15 +78,6 @@
} while(0) } while(0)
// TODO: replace uses of this with g_check_parse_failed
#define g_check_failed(res) do { \
const HParseResult *result = (res); \
if (NULL != result) { \
g_test_message("Check failed: shouldn't have succeeded, but did"); \
g_test_fail(); \
} \
} while(0)
#define g_check_parse_failed(parser, backend, input, inp_len) do { \ #define g_check_parse_failed(parser, backend, input, inp_len) do { \
int skip = h_compile((HParser *)(parser), (HParserBackend)backend, NULL); \ int skip = h_compile((HParser *)(parser), (HParserBackend)backend, NULL); \
if(skip != 0) { \ if(skip != 0) { \
@ -94,8 +85,9 @@
g_test_fail(); \ g_test_fail(); \
break; \ break; \
} \ } \
const HParseResult *result = h_parse(parser, (const uint8_t*)input, inp_len); \ HParseResult *result = h_parse(parser, (const uint8_t*)input, inp_len); \
if (NULL != result) { \ if (NULL != result) { \
h_parse_result_free(result); \
g_test_message("Check failed: shouldn't have succeeded, but did"); \ g_test_message("Check failed: shouldn't have succeeded, but did"); \
g_test_fail(); \ g_test_fail(); \
} \ } \
@ -119,7 +111,7 @@
"Inefficiency: %5f%%", \ "Inefficiency: %5f%%", \
stats.used, stats.wasted, \ stats.used, stats.wasted, \
stats.wasted * 100. / (stats.used+stats.wasted)); \ stats.wasted * 100. / (stats.used+stats.wasted)); \
h_delete_arena(res->arena); \ h_parse_result_free(res); \
} \ } \
} while(0) } while(0)
@ -144,7 +136,7 @@
"Inefficiency: %5f%%", \ "Inefficiency: %5f%%", \
stats.used, stats.wasted, \ stats.used, stats.wasted, \
stats.wasted * 100. / (stats.used+stats.wasted)); \ stats.wasted * 100. / (stats.used+stats.wasted)); \
h_delete_arena(res->arena); \ h_parse_result_free(res); \
} \ } \
} while(0) } while(0)
@ -167,8 +159,9 @@
} \ } \
h_parse_chunk(s, (const uint8_t*)chunk1, c1_len); \ h_parse_chunk(s, (const uint8_t*)chunk1, c1_len); \
h_parse_chunk(s, (const uint8_t*)chunk2, c2_len); \ h_parse_chunk(s, (const uint8_t*)chunk2, c2_len); \
const HParseResult *res = h_parse_finish(s); \ HParseResult *res = h_parse_finish(s); \
if (NULL != res) { \ if (NULL != res) { \
h_parse_result_free(res); \
g_test_message("Check failed: shouldn't have succeeded, but did"); \ g_test_message("Check failed: shouldn't have succeeded, but did"); \
g_test_fail(); \ g_test_fail(); \
} \ } \
@ -207,7 +200,7 @@
"Inefficiency: %5f%%", \ "Inefficiency: %5f%%", \
stats.used, stats.wasted, \ stats.used, stats.wasted, \
stats.wasted * 100. / (stats.used+stats.wasted)); \ stats.wasted * 100. / (stats.used+stats.wasted)); \
h_delete_arena(res->arena); \ h_parse_result_free(res); \
} \ } \
} while(0) } while(0)