From 238dbabef80be07e524a30eac0ba883a7972efef Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 17 Dec 2019 13:49:40 +0100 Subject: [PATCH] tests: Unbreak strict builds on Ubuntu Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider (cherry picked from commit 9d5616a18c200fb7163eed5939873bdbb0b665f6) --- tests/client/torture_scp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/client/torture_scp.c b/tests/client/torture_scp.c index 2784157c..8f080af3 100644 --- a/tests/client/torture_scp.c +++ b/tests/client/torture_scp.c @@ -157,7 +157,7 @@ static void torture_scp_upload(void **state) char expected_a[BUF_SIZE]; char buf[BUF_SIZE]; FILE *file = NULL; - + size_t len = 0; int rc; assert_non_null(state); @@ -202,7 +202,8 @@ static void torture_scp_upload(void **state) file = fopen(buf, "r"); assert_non_null(file); - fread(buf, BUF_SIZE, 1, file); + len = fread(buf, BUF_SIZE, 1, file); + assert_int_equal(len, 1); assert_memory_equal(buf, expected_a, BUF_SIZE); fclose(file); @@ -218,8 +219,8 @@ static void torture_scp_upload_recursive(void **state) char expected_b[BUF_SIZE]; char buf[BUF_SIZE]; - FILE *file = NULL; + size_t len = 0; int rc; @@ -273,7 +274,8 @@ static void torture_scp_upload_recursive(void **state) file = fopen(buf, "r"); assert_non_null(file); - fread(buf, BUF_SIZE, 1, file); + len = fread(buf, BUF_SIZE, 1, file); + assert_int_equal(len, 1); assert_memory_equal(buf, expected_b, BUF_SIZE); fclose(file); @@ -480,7 +482,7 @@ static void torture_scp_upload_newline(void **state) FILE *file = NULL; char buf[1024]; - + char *rs = NULL; int rc; assert_non_null(state); @@ -531,7 +533,8 @@ static void torture_scp_upload_newline(void **state) file = fopen(buf, "r"); assert_non_null(file); - fgets(buf, 1024, file); + rs = fgets(buf, 1024, file); + assert_non_null(rs); assert_string_equal(buf, "original"); fclose(file);