summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Janes <mark.a.janes@intel.com>2016-02-09 10:20:12 -0800
committerMark Janes <mark.a.janes@intel.com>2016-02-09 10:53:08 -0800
commit2b2f6f4a6b39d1760fbe42294db8fef5e7238b5e (patch)
tree6e3237af13aa8f054b8359cb0c591c887078e6d9
parentf2ba6fcf76fcc95395890d17da86f683068eba5f (diff)
build: fix string formatting for 32 bit compilation
Several printf format strings used %lu for uint64 types, which does not match when compiled with -m32
-rw-r--r--src/framework/test/t_dump.c4
-rw-r--r--src/tests/func/query/timestamp.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/framework/test/t_dump.c b/src/framework/test/t_dump.c
index cf3296a..a7c5ed3 100644
--- a/src/framework/test/t_dump.c
+++ b/src/framework/test/t_dump.c
@@ -40,10 +40,10 @@ t_dump_seq_image(cru_image_t *image)
return;
uint64_t seq = cru_refcount_get(&t->dump_seq);
- t_assertf(seq <= 9999, "image sequence %lu exceeds 9999", seq);
+ t_assertf(seq <= 9999, "image sequence %llu exceeds 9999", seq);
string_t filename = STRING_INIT;
- string_printf(&filename, "%s.seq%04lu.png", t_name, seq);
+ string_printf(&filename, "%s.seq%04llu.png", t_name, seq);
cru_image_write_file(image, string_data(&filename));
}
diff --git a/src/tests/func/query/timestamp.c b/src/tests/func/query/timestamp.c
index 5730467..e56d996 100644
--- a/src/tests/func/query/timestamp.c
+++ b/src/tests/func/query/timestamp.c
@@ -49,8 +49,8 @@ get_timestamp(void)
sizeof(results), results, sizeof *results,
VK_QUERY_RESULT_64_BIT);
- printf("top timestamp: %20ld (%016lx)\n", results[0], results[0]);
- printf("bottom timestamp: %20ld (%016lx)\n", results[1], results[1]);
+ printf("top timestamp: %20lld (%016llx)\n", results[0], results[0]);
+ printf("bottom timestamp: %20lld (%016llx)\n", results[1], results[1]);
return results[0];
}
@@ -66,7 +66,7 @@ test_timestamp(void)
freq = 1 / (t_physical_dev_props->limits.timestampPeriod * 1000);
elapsed_ms = (b - a) / freq;
- printf("difference: %lu - %lu = %lu\n", b / freq, a / freq, elapsed_ms);
+ printf("difference: %llu - %llu = %llu\n", b / freq, a / freq, elapsed_ms);
if (elapsed_ms < 90 || elapsed_ms > 110)
t_fail();
else