Security-58286.1.32.tar.gz

[apple/security.git] / OSX / regressions / test / testmore.h

diff --git a/OSX/regressions/test/testmore.h b/OSX/regressions/test/testmore.h
index 6a776f78e6b53d299d392292da362f361d8c46ae..7bf5e726a5f727f8db172e7e457b5da75809e871 100644 (file)
--- a/OSX/regressions/test/testmore.h
+++ b/OSX/regressions/test/testmore.h
@@ -164,6 +164,12 @@ static void test_failed_noreturn() __attribute((analyzer_noreturn)) {
 #define plan_skip_all(REASON) test_plan_skip_all(REASON)
 #define plan_tests(COUNT) test_plan_tests(COUNT, __FILE__, __LINE__)
 
+#define test_IsTrue(THIS, ...) ok(THIS, __VA_ARGS__)
+#define test_IsEqual(THIS, THAT, ...) is(THIS, THAT, __VA_ARGS__)
+#define test_IsNotEqual(THIS, THAT, ...) isnt(THIS, THAT, __VA_ARGS__)
+#define test_Pass(...) pass(__VA_ARGS__)
+#define test_Fail(...) fail(__VA_ARGS__)
+
 #define ok_status(THIS, ...) \
 ({ \
        OSStatus _this = THIS; \
@@ -214,7 +220,7 @@ extern const char *test_reason;
 
 void test_bail_out(const char *reason, const char *file, unsigned line);
 int test_diag(const char *directive, const char *reason,
-       const char *file, unsigned line, const char *fmt, ...);
+       const char *file, unsigned line, const char *fmt, ...) __attribute__((format(printf, 5, 6)));
 int test_ok(int passed, __attribute((cf_consumed)) CFStringRef description, const char *directive,
        const char *reason, const char *file, unsigned line, const char *fmt, ...);
 void test_plan_skip_all(const char *reason);