From 092f9aea4bff60d227142dc9c4dd37795fa850e1 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 4 Oct 2019 12:27:04 -0400 Subject: [PATCH] tests: add format attributes to functions receiving format strings in tap.h This makes the compiler validate the format strings against the types of the passed arguments. It found a few (minor) issues, which are also fixed by this patch. Note that in test_bitfield.c, the format string now includes "0x" before printing the number in hexadecimal, to avoid any confusion when the user reads it. Change-Id: I07cac88aa3cdd445d79f2c12bc0f9333f6a768a9 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/2129 Tested-by: jenkins --- tests/bitfield/test_bitfield.c | 144 +++++++++++------- .../test_bin_info.c | 6 +- tests/utils/tap/tap.h | 4 + 3 files changed, 99 insertions(+), 55 deletions(-) diff --git a/tests/bitfield/test_bitfield.c b/tests/bitfield/test_bitfield.c index b9bd6d40..558e3419 100644 --- a/tests/bitfield/test_bitfield.c +++ b/tests/bitfield/test_bitfield.c @@ -48,8 +48,8 @@ void fct(void) #define UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%X, unsigned int source, varying write unit size" #define UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long dest, varying read unit size" #define UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR "Writing and reading back 0x%llX, unsigned long long source, varying write unit size" -#define DIAG_FMT_STR "Failed reading value written \"%s\"-wise, with start=%i" \ - " and length=%i. Read %llX" +#define DIAG_FMT_STR(val_type_fmt) "Failed reading value written \"%s\"-wise, with start=%i" \ + " and length=%i. Read 0x" val_type_fmt static unsigned int fls_u64(uint64_t x) @@ -136,16 +136,16 @@ do { \ (c)[i] = (val); \ } while (0) -#define check_result(ref, val, buffer, typename, start, len, \ - desc_fmt_str) \ -({ \ - if ((val) != (ref)) { \ - fail(desc_fmt_str, ref); \ - diag(DIAG_FMT_STR, #typename, start, len, val); \ - printf("# "); \ - print_byte_array(buffer, TEST_LEN); \ - } \ - (val) != (ref); \ +#define check_result(ref, val, buffer, typename, start, len, \ + desc_fmt_str, val_type_fmt) \ +({ \ + if ((val) != (ref)) { \ + fail(desc_fmt_str, ref); \ + diag(DIAG_FMT_STR(val_type_fmt), #typename, start, len, val); \ + printf("# "); \ + print_byte_array(buffer, TEST_LEN); \ + } \ + (val) != (ref); \ }) void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) @@ -171,7 +171,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ui, readval, target.c, unsigned char, - s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -179,7 +180,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.s, unsigned short, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ui, readval, target.c, unsigned short, - s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -187,7 +189,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.i, unsigned int, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ui, readval, target.c, unsigned int, - s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -195,7 +198,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.l, unsigned long, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ui, readval, target.c, unsigned long, - s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -203,7 +207,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.ll, unsigned long long, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ui, readval, target.c, unsigned long long, - s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } } @@ -220,7 +225,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ull); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ull, readval, target.c, unsigned char, - s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -228,7 +234,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.s, unsigned short, s, l, src_ull); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ull, readval, target.c, unsigned short, - s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -236,7 +243,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.i, unsigned int, s, l, src_ull); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ull, readval, target.c, unsigned int, - s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -244,7 +252,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.l, unsigned long, s, l, src_ull); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ull, readval, target.c, unsigned long, - s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -252,7 +261,8 @@ void run_test_unsigned_write(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.ll, unsigned long long, s, l, src_ull); bt_bitfield_read(target.c, unsigned char, s, l, &readval); if (check_result(src_ull, readval, target.c, unsigned long long, - s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } } @@ -283,7 +293,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.c, unsigned char, s, l, &readval_ui); if (check_result(src_ui, readval_ui, target.c, unsigned char, - s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -291,7 +302,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.s, unsigned short, s, l, &readval_ui); if (check_result(src_ui, readval_ui, target.c, unsigned short, - s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -299,7 +311,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.i, unsigned int, s, l, &readval_ui); if (check_result(src_ui, readval_ui, target.c, unsigned int, - s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -307,7 +320,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.l, unsigned long, s, l, &readval_ui); if (check_result(src_ui, readval_ui, target.c, unsigned long, - s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -315,7 +329,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ui); bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ui); if (check_result(src_ui, readval_ui, target.c, unsigned long long, - s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } } @@ -332,7 +347,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ull); bt_bitfield_read(target.c, unsigned char, s, l, &readval_ull); if (check_result(src_ull, readval_ull, target.c, unsigned char, - s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -340,7 +356,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ull); bt_bitfield_read(target.s, unsigned short, s, l, &readval_ull); if (check_result(src_ull, readval_ull, target.c, unsigned short, - s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -348,7 +365,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ull); bt_bitfield_read(target.i, unsigned int, s, l, &readval_ull); if (check_result(src_ull, readval_ull, target.c, unsigned int, - s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -356,7 +374,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ull); bt_bitfield_read(target.l, unsigned long, s, l, &readval_ull); if (check_result(src_ull, readval_ull, target.c, unsigned long, - s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -364,7 +383,8 @@ void run_test_unsigned_read(unsigned int src_ui, unsigned long long src_ull) bt_bitfield_write(target.c, unsigned char, s, l, src_ull); bt_bitfield_read(target.ll, unsigned long long, s, l, &readval_ull); if (check_result(src_ull, readval_ull, target.c, unsigned long long, - s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, UNSIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } } @@ -405,7 +425,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_i, readval, target.c, signed char, - s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -413,7 +434,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.s, short, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_i, readval, target.c, short, - s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -421,7 +443,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.i, int, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_i, readval, target.c, int, - s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -429,7 +452,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.l, long, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_i, readval, target.c, long, - s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -437,7 +461,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.ll, long long, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_i, readval, target.c, long long, - s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } } @@ -458,7 +483,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_ll); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_ll, readval, target.c, signed char, - s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -466,7 +492,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.s, short, s, l, src_ll); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_ll, readval, target.c, short, - s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -474,7 +501,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.i, int, s, l, src_ll); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_ll, readval, target.c, int, - s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -482,7 +510,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.l, long, s, l, src_ll); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_ll, readval, target.c, long, - s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -490,7 +519,8 @@ void run_test_signed_write(int src_i, long long src_ll) bt_bitfield_write(target.ll, long long, s, l, src_ll); bt_bitfield_read(target.c, signed char, s, l, &readval); if (check_result(src_ll, readval, target.c, long long, - s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_WRITE_TEST_DESC_FMT_STR, + "%llX")) { return; } } @@ -526,7 +556,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.c, signed char, s, l, &readval_i); if (check_result(src_i, readval_i, target.c, signed char, - s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -534,7 +565,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.s, short, s, l, &readval_i); if (check_result(src_i, readval_i, target.c, short, - s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -542,7 +574,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.i, int, s, l, &readval_i); if (check_result(src_i, readval_i, target.c, int, - s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -550,7 +583,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.l, long, s, l, &readval_i); if (check_result(src_i, readval_i, target.c, long, - s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } @@ -558,7 +592,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_i); bt_bitfield_read(target.ll, long long, s, l, &readval_i); if (check_result(src_i, readval_i, target.c, long long, - s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_INT_READ_TEST_DESC_FMT_STR, + "%X")) { return; } } @@ -579,7 +614,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_ll); bt_bitfield_read(target.c, signed char, s, l, &readval_ll); if (check_result(src_ll, readval_ll, target.c, signed char, - s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -587,7 +623,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_ll); bt_bitfield_read(target.s, short, s, l, &readval_ll); if (check_result(src_ll, readval_ll, target.c, short, - s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -595,7 +632,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_ll); bt_bitfield_read(target.i, int, s, l, &readval_ll); if (check_result(src_ll, readval_ll, target.c, int, - s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -603,7 +641,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_ll); bt_bitfield_read(target.l, long, s, l, &readval_ll); if (check_result(src_ll, readval_ll, target.c, long, - s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } @@ -611,7 +650,8 @@ void run_test_signed_read(int src_i, long long src_ll) bt_bitfield_write(target.c, signed char, s, l, src_ll); bt_bitfield_read(target.ll, long long, s, l, &readval_ll); if (check_result(src_ll, readval_ll, target.c, long long, - s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR)) { + s, l, SIGNED_LONG_LONG_READ_TEST_DESC_FMT_STR, + "%llX")) { return; } } diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c index b9ee32e0..fec4142d 100644 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c @@ -151,7 +151,7 @@ void subtest_lookup_function_name(struct bin_info *bin, uint64_t addr, char *_func_name = NULL; ret = bin_info_lookup_function_name(bin, addr, &_func_name); - ok(ret == 0, "bin_info_lookup_function_name successful at 0x%x", addr); + ok(ret == 0, "bin_info_lookup_function_name successful at 0x%" PRIx64, addr); if (_func_name) { ok(strcmp(_func_name, func_name) == 0, "bin_info_lookup_function_name - correct function name (%s == %s)", @@ -178,11 +178,11 @@ void subtest_lookup_source_location(struct bin_info *bin, uint64_t addr, struct source_location *src_loc = NULL; ret = bin_info_lookup_source_location(bin, addr, &src_loc); - ok(ret == 0, "bin_info_lookup_source_location successful at 0x%x", + ok(ret == 0, "bin_info_lookup_source_location successful at 0x%" PRIx64, addr); if (src_loc) { ok(src_loc->line_no == line_no, - "bin_info_lookup_source_location - correct line_no (%d == %d)", + "bin_info_lookup_source_location - correct line_no (%" PRIu64 " == %" PRIu64 ")", line_no, src_loc->line_no); ok(strcmp(src_loc->filename, filename) == 0, "bin_info_lookup_source_location - correct filename (%s == %s)", diff --git a/tests/utils/tap/tap.h b/tests/utils/tap/tap.h index 40fb7916..08e4f415 100644 --- a/tests/utils/tap/tap.h +++ b/tests/utils/tap/tap.h @@ -74,17 +74,21 @@ #define skip_end() } while(0); +__attribute__((format(printf, 5, 6))) unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...); int plan_no_plan(void); int plan_skip_all(char *); int plan_tests(unsigned int); +__attribute__((format(printf, 1, 2))) unsigned int diag(char *, ...); void diag_multiline(const char *); +__attribute__((format(printf, 2, 3))) int skip(unsigned int, char *, ...); +__attribute__((format(printf, 1, 2))) void todo_start(char *, ...); void todo_end(void); -- 2.34.1