Commit 0131a851 authored by Mike Rapoport's avatar Mike Rapoport Committed by Andrei Vagin

zdtm: use {read,write}_data in fifo tests

Reading and writing large buffers may result in short read/write. In cases
we expect the entire buffer to be transferred use {read,write}_data rather
than plain read/write syscalls.

Reported-by: Mr Jenkins
Signed-off-by: 's avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent d8c974d6
...@@ -20,7 +20,6 @@ int main(int argc, char **argv) ...@@ -20,7 +20,6 @@ int main(int argc, char **argv)
mode_t mode = S_IFIFO | 0700; mode_t mode = S_IFIFO | 0700;
uint8_t buf[256]; uint8_t buf[256];
uint32_t crc; uint32_t crc;
int ret;
test_init(argc, argv); test_init(argc, argv);
...@@ -43,8 +42,7 @@ int main(int argc, char **argv) ...@@ -43,8 +42,7 @@ int main(int argc, char **argv)
crc = ~0; crc = ~0;
datagen(buf, sizeof(buf), &crc); datagen(buf, sizeof(buf), &crc);
ret = write(fd, buf, sizeof(buf)); if (write_data(fd, buf, sizeof(buf))) {
if (ret != sizeof(buf)) {
pr_perror("write() failed"); pr_perror("write() failed");
return 1; return 1;
} }
...@@ -59,8 +57,7 @@ int main(int argc, char **argv) ...@@ -59,8 +57,7 @@ int main(int argc, char **argv)
test_daemon(); test_daemon();
test_waitsig(); test_waitsig();
ret = read(fd_ro, buf, sizeof(buf)); if (read_data(fd_ro, buf, sizeof(buf))) {
if (ret != sizeof(buf)) {
pr_perror("read() failed"); pr_perror("read() failed");
return 1; return 1;
} }
......
...@@ -23,7 +23,6 @@ int main(int argc, char **argv) ...@@ -23,7 +23,6 @@ int main(int argc, char **argv)
mode_t mode = S_IFIFO | 0700; mode_t mode = S_IFIFO | 0700;
uint8_t buf[BUF_SIZE]; uint8_t buf[BUF_SIZE];
uint32_t crc; uint32_t crc;
int ret;;
test_init(argc, argv); test_init(argc, argv);
...@@ -40,8 +39,7 @@ int main(int argc, char **argv) ...@@ -40,8 +39,7 @@ int main(int argc, char **argv)
crc = ~0; crc = ~0;
datagen(buf, BUF_SIZE, &crc); datagen(buf, BUF_SIZE, &crc);
ret = write(fd, buf, BUF_SIZE); if (write_data(fd, buf, BUF_SIZE)) {
if (ret != BUF_SIZE) {
pr_perror("write() failed"); pr_perror("write() failed");
return 1; return 1;
} }
...@@ -49,8 +47,7 @@ int main(int argc, char **argv) ...@@ -49,8 +47,7 @@ int main(int argc, char **argv)
test_daemon(); test_daemon();
test_waitsig(); test_waitsig();
ret = read(fd, buf, BUF_SIZE); if (read_data(fd, buf, BUF_SIZE)) {
if (ret != BUF_SIZE) {
pr_perror("read() failed"); pr_perror("read() failed");
return 1; return 1;
} }
......
...@@ -23,7 +23,6 @@ int main(int argc, char **argv) ...@@ -23,7 +23,6 @@ int main(int argc, char **argv)
mode_t mode = S_IFIFO | 0700; mode_t mode = S_IFIFO | 0700;
uint8_t buf[BUF_SIZE]; uint8_t buf[BUF_SIZE];
uint32_t crc; uint32_t crc;
int ret;;
test_init(argc, argv); test_init(argc, argv);
...@@ -46,8 +45,7 @@ int main(int argc, char **argv) ...@@ -46,8 +45,7 @@ int main(int argc, char **argv)
crc = ~0; crc = ~0;
datagen(buf, BUF_SIZE, &crc); datagen(buf, BUF_SIZE, &crc);
ret = write(fd, buf, BUF_SIZE); if (write_data(fd, buf, BUF_SIZE)) {
if (ret != BUF_SIZE) {
pr_perror("write() failed"); pr_perror("write() failed");
return 1; return 1;
} }
...@@ -57,8 +55,7 @@ int main(int argc, char **argv) ...@@ -57,8 +55,7 @@ int main(int argc, char **argv)
test_daemon(); test_daemon();
test_waitsig(); test_waitsig();
ret = read(fd_ro, buf, BUF_SIZE); if (read_data(fd_ro, buf, BUF_SIZE)) {
if (ret != BUF_SIZE) {
pr_perror("read() failed"); pr_perror("read() failed");
return 1; return 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment