From 23f17f7972c34fc96249ffd2d58004ab048dcba0 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 4 Jan 2014 00:35:45 +0100 Subject: [PATCH] [test] Add okx() macro taking an explicit file name and line number Allow test reports to specify an explicit file name and line number using the extended okx() macro. This allows large blocks of test report code such as tcpip_random_ok() to be implemented as functions rather than macros. Signed-off-by: Michael Brown --- src/include/ipxe/test.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/include/ipxe/test.h b/src/include/ipxe/test.h index 6b74ff00..028ee29f 100644 --- a/src/include/ipxe/test.h +++ b/src/include/ipxe/test.h @@ -38,9 +38,12 @@ extern void test_ok ( int success, const char *file, unsigned int line, * Report test result * * @v success Test succeeded + * @v file File name + * @v line Line number */ -#define ok( success ) do { \ - test_ok ( (success), __FILE__, __LINE__, #success ); \ - } while ( 0 ) +#define okx( success, file, line ) \ + test_ok ( success, file, line, #success ) +#define ok( success ) \ + okx ( success, __FILE__, __LINE__ ) #endif /* _IPXE_TEST_H */