From: Chao Yu Date: Mon, 16 Nov 2015 21:43:43 +0000 (+1100) Subject: generic/285: fix the wrong result printed in full log X-Git-Tag: v2022.05.01~2745 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=b056c775021a2d6330104d9882791981706b9261 generic/285: fix the wrong result printed in full log This issue was found by testing f2fs module with generic/285, and the related bug has already been fixed since commit 2e023174a88d ("f2fs: avoid data offset overflow when lseeking huge file"), but forgot to fix it in xfstest suit. The wrong result printed is printed in log below: 10. Test a huge file for offset overflow 10.01 SEEK_HOLE expected 65536 or 0, got 65536. succ 10.02 SEEK_HOLE expected 65536 or 0, got 65536. succ 10.03 SEEK_DATA expected 0 or 0, got 0. succ 10.04 SEEK_DATA expected 1 or 1, got 1. succ 10.05 SEEK_HOLE expected 0 or 0, got 0. FAIL 10.06 SEEK_DATA expected -65536 or -65536, got -65536. succ 10.07 SEEK_DATA expected -65535 or -65535, got -65535. succ 10.08 SEEK_DATA expected -65536 or -65536, got -65536. FAIL The result printed in the log shows that when some test cases failed, the data we expected and got are the same that is not correct obviously. The reason is that we cast the result from type off_t(64-bit) to type long(32-bit) when doing huge file offset seeking tests in 32-bit machine. This patch fixes the wrong printing issue. Signed-off-by: Chao Yu Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/src/seek_sanity_test.c b/src/seek_sanity_test.c index 7cf45c0d..18262c2b 100644 --- a/src/seek_sanity_test.c +++ b/src/seek_sanity_test.c @@ -187,10 +187,10 @@ static int do_lseek(int testnum, int subtest, int fd, off_t filsz, int origin, ret = !(errno == ENXIO); } else { - x = fprintf(stdout, "%02d.%02d %s expected %ld or %ld, got %ld. ", + x = fprintf(stdout, "%02d.%02d %s expected %lld or %lld, got %lld. ", testnum, subtest, (origin == SEEK_HOLE) ? "SEEK_HOLE" : "SEEK_DATA", - (long)exp, (long)exp2, (long)pos); + (long long)exp, (long long)exp2, (long long)pos); ret = !(pos == exp || pos == exp2); }