diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/assert.c | 19 | ||||
-rw-r--r-- | test/corestrings.c | 2 | ||||
-rw-r--r-- | test/data/Choices-all | 1 | ||||
-rwxr-xr-x | test/monkey-see-monkey-do | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/test/assert.c b/test/assert.c index d21926e5e..fb4db8cc9 100644 --- a/test/assert.c +++ b/test/assert.c @@ -30,7 +30,23 @@ __ns_assert_fail(const char *__assertion, const char *__file, unsigned int __line, const char *__function) __THROW __attribute__ ((__noreturn__)); -/* We use this to flush coverage data */ +#if __GNUC__ > 10 + +/* We use this to dump coverage data in gcc 11 and later */ +extern void __gcov_dump(void); + +/* And here's our entry point */ +void +__ns_assert_fail(const char *__assertion, const char *__file, + unsigned int __line, const char *__function) +{ + __gcov_dump(); + __assert_fail(__assertion, __file, __line, __function); +} + +#else + +/* We use this to flush coverage data before gcc 11 */ extern void __gcov_flush(void); /* And here's our entry point */ @@ -41,3 +57,4 @@ __ns_assert_fail(const char *__assertion, const char *__file, __gcov_flush(); __assert_fail(__assertion, __file, __line, __function); } +#endif diff --git a/test/corestrings.c b/test/corestrings.c index 43eb5130e..c3c4e93eb 100644 --- a/test/corestrings.c +++ b/test/corestrings.c @@ -40,7 +40,7 @@ * * This is used to test all the out of memory paths in initialisation. */ -#define CORESTRING_TEST_COUNT 487 +#define CORESTRING_TEST_COUNT 488 START_TEST(corestrings_test) { diff --git a/test/data/Choices-all b/test/data/Choices-all index 829a270e0..5c26f2887 100644 --- a/test/data/Choices-all +++ b/test/data/Choices-all @@ -26,6 +26,7 @@ foreground_images:1 background_images:1 animate_images:1 enable_javascript:1 +author_level_css:1 script_timeout:10 expire_url:28 font_default:0 diff --git a/test/monkey-see-monkey-do b/test/monkey-see-monkey-do index 4dc761aae..72b8685ec 100755 --- a/test/monkey-see-monkey-do +++ b/test/monkey-see-monkey-do @@ -117,7 +117,7 @@ def main(): index = index.read() print("Parsing tests...") - test_set = yaml.load_all(index) + test_set = yaml.load_all(index, Loader=yaml.SafeLoader) print("Running tests...") ret = 0 |