From 0407d10f147862eb1c7854aed3adfbc3e1503c5d Mon Sep 17 00:00:00 2001
From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Fri, 10 Apr 2020 11:13:12 +0300
Subject: tests: do not truncate file offsets and sizes to 32-bit

Do not truncate file offsets and sizes to 32-bit to
prevent tests from spurious failures on >2Gb files.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>

Change-Id: I2a77ea5f9f415249b23035eecf07129f19194ac2
Fixes: #1161
---
 tests/basic/posix/zero-fill-enospace.c | 7 ++++---
 tests/bugs/shard/bug-1696136.c         | 5 +++--
 tests/bugs/shard/bug-shard-discard.c   | 5 +++--
 tests/bugs/shard/shard-fallocate.c     | 5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tests/basic/posix/zero-fill-enospace.c b/tests/basic/posix/zero-fill-enospace.c
index 1371ff59a5..b1f142c6be 100644
--- a/tests/basic/posix/zero-fill-enospace.c
+++ b/tests/basic/posix/zero-fill-enospace.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <glusterfs/api/glfs.h>
 #include <glusterfs/api/glfs-handles.h>
 
@@ -8,7 +9,7 @@ main(int argc, char *argv[])
     glfs_t *fs = NULL;
     glfs_fd_t *fd = NULL;
     int ret = 1;
-    int size = 0;
+    off_t size = 0;
 
     if (argc != 6) {
         fprintf(stderr,
@@ -45,12 +46,12 @@ main(int argc, char *argv[])
         goto out;
     }
 
-    size = atoi(argv[5]);
+    size = strtol(argv[5], NULL, 10);
     if (size < 0) {
         fprintf(stderr, "Wrong size %s", argv[5]);
         goto out;
     }
-    ret = glfs_zerofill(fd, 0, atoi(argv[5]));
+    ret = glfs_zerofill(fd, 0, size);
     if (ret <= 0) {
         fprintf(stderr, "glfs_zerofill: returned %d\n", ret);
         goto out;
diff --git a/tests/bugs/shard/bug-1696136.c b/tests/bugs/shard/bug-1696136.c
index b9e8d1375e..cb650535b0 100644
--- a/tests/bugs/shard/bug-1696136.c
+++ b/tests/bugs/shard/bug-1696136.c
@@ -87,8 +87,9 @@ main(int argc, char *argv[])
         goto out;
     }
 
-    offset = atoi(argv[4]);
-    len = atoi(argv[5]);
+    /* Note that off_t is signed but size_t isn't. */
+    offset = strtol(argv[4], NULL, 10);
+    len = strtoul(argv[5], NULL, 10);
 
     fd = glfs_open(fs, argv[6], O_RDWR);
     if (fd == NULL) {
diff --git a/tests/bugs/shard/bug-shard-discard.c b/tests/bugs/shard/bug-shard-discard.c
index 15dca6c218..6fa93fb89d 100644
--- a/tests/bugs/shard/bug-shard-discard.c
+++ b/tests/bugs/shard/bug-shard-discard.c
@@ -50,8 +50,9 @@ main(int argc, char *argv[])
         goto out;
     }
 
-    off = atoi(argv[4]);
-    len = atoi(argv[5]);
+    /* Note that off_t is signed but size_t isn't. */
+    off = strtol(argv[4], NULL, 10);
+    len = strtoul(argv[5], NULL, 10);
 
     ret = glfs_discard(fd, off, len);
     if (ret <= 0) {
diff --git a/tests/bugs/shard/shard-fallocate.c b/tests/bugs/shard/shard-fallocate.c
index 45b9ce0050..cb0714e856 100644
--- a/tests/bugs/shard/shard-fallocate.c
+++ b/tests/bugs/shard/shard-fallocate.c
@@ -87,8 +87,9 @@ main(int argc, char *argv[])
         goto out;
     }
 
-    offset = atoi(argv[4]);
-    len = atoi(argv[5]);
+    /* Note that off_t is signed but size_t isn't. */
+    offset = strtol(argv[4], NULL, 10);
+    len = strtoul(argv[5], NULL, 10);
 
     fd = glfs_open(fs, argv[6], O_RDWR);
     if (fd == NULL) {
-- 
cgit