vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The old code gives arguments to a printf function which can't work

Browse source 
correctly, and the compiler complains.

	* grub-core/tests/example_functional_test.c (example_test): Add
	missing text.
	* grub-core/tests/lib/test.c (add_failure): Rewrite.
	* include/grub/test.h (grub_test_assert_helper): New declaration.
	(grub_test_assert): Use grub_test_assert_helper.
This commit is contained in:
Peter Jones 2012-05-27 14:26:18 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent 526ef13d34
commit 2787ae53d6
4 changed files with 103 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/grub/test.h
View file

@ -54,10 +54,14 @@ void grub_test_nonzero (int cond, const char *file,
__attribute__ ((format (printf, 5, 6)));
/* Macro to fill in location details and an optional error message. */
void grub_test_assert_helper (int cond, const char *file,
const char *func, grub_uint32_t line,
const char *condstr, const char *fmt, ...)
__attribute__ ((format (printf, 6, 7)));
#define grub_test_assert(cond, ...) \
grub_test_nonzero(cond, GRUB_FILE, __FUNCTION__, __LINE__, \
## __VA_ARGS__, \
"assert failed: %s", #cond)
grub_test_assert_helper(cond, GRUB_FILE, __FUNCTION__, __LINE__, \
#cond, ## __VA_ARGS__);
void grub_unit_test_init (void);
void grub_unit_test_fini (void);