58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
Index: expat-2.5.0/tests/minicheck.h
|
|
===================================================================
|
|
--- expat-2.5.0.orig/tests/minicheck.h
|
|
+++ expat-2.5.0/tests/minicheck.h
|
|
@@ -64,7 +64,13 @@ extern "C" {
|
|
} \
|
|
}
|
|
|
|
-#define fail(msg) _fail_unless(0, __FILE__, __LINE__, msg)
|
|
+#define fail(msg) _fail(__FILE__, __LINE__, msg)
|
|
+#define assert_true(cond) \
|
|
+ do { \
|
|
+ if (! (cond)) { \
|
|
+ _fail(__FILE__, __LINE__, "check failed: " #cond); \
|
|
+ } \
|
|
+ } while (0)
|
|
|
|
typedef void (*tcase_setup_function)(void);
|
|
typedef void (*tcase_teardown_function)(void);
|
|
@@ -104,6 +110,10 @@ void _check_set_test_info(char const *fu
|
|
*/
|
|
|
|
void _fail_unless(int condition, const char *file, int line, const char *msg);
|
|
+# if defined(__GNUC__)
|
|
+__attribute__((noreturn))
|
|
+# endif
|
|
+void _fail(const char *file, int line, const char *msg);
|
|
Suite *suite_create(const char *name);
|
|
TCase *tcase_create(const char *name);
|
|
void suite_add_tcase(Suite *suite, TCase *tc);
|
|
Index: expat-2.5.0/tests/minicheck.c
|
|
===================================================================
|
|
--- expat-2.5.0.orig/tests/minicheck.c
|
|
+++ expat-2.5.0/tests/minicheck.c
|
|
@@ -224,6 +224,22 @@ _fail_unless(int condition, const char *
|
|
longjmp(env, 1);
|
|
}
|
|
|
|
+void
|
|
+_fail(const char *file, int line, const char *msg) {
|
|
+ /* Always print the error message so it isn't lost. In this case,
|
|
+ we have a failure, so there's no reason to be quiet about what
|
|
+ it is.
|
|
+ */
|
|
+ _check_current_filename = file;
|
|
+ _check_current_lineno = line;
|
|
+ if (msg != NULL) {
|
|
+ const int has_newline = (msg[strlen(msg) - 1] == '\n');
|
|
+ fprintf(stderr, "ERROR: %s%s", msg, has_newline ? "" : "\n");
|
|
+ }
|
|
+ longjmp(env, 1);
|
|
+}
|
|
+
|
|
+
|
|
int
|
|
srunner_ntests_failed(SRunner *runner) {
|
|
assert(runner != NULL);
|