From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XKJmC-00050R-JS for ltp-list@lists.sourceforge.net; Thu, 21 Aug 2014 04:15:04 +0000 Received: from mx4-phx2.redhat.com ([209.132.183.25]) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1XKJmB-0008Uk-3B for ltp-list@lists.sourceforge.net; Thu, 21 Aug 2014 04:15:04 +0000 Date: Thu, 21 Aug 2014 00:14:56 -0400 (EDT) From: Xiong Zhou Message-ID: <112335100.22365402.1408594496771.JavaMail.zimbra@redhat.com> In-Reply-To: <332769995.22364804.1408594421188.JavaMail.zimbra@redhat.com> MIME-Version: 1.0 Subject: [LTP] [PATCH v3 2/3] diotest4: Some code cleanup in diotest4.c List-Id: Linux Test Project General Discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-list-bounces@lists.sourceforge.net To: ltp-list@lists.sourceforge.net Split dup code cleanup and function change from v2. Signed-off-by: Xiong Zhou --- testcases/kernel/io/direct_io/diotest4.c | 100 ++++++++++--------------------- 1 file changed, 32 insertions(+), 68 deletions(-) diff --git a/testcases/kernel/io/direct_io/diotest4.c b/testcases/kernel/io/direct_io/diotest4.c index 10281bf..8059f28 100644 --- a/testcases/kernel/io/direct_io/diotest4.c +++ b/testcases/kernel/io/direct_io/diotest4.c @@ -171,6 +171,16 @@ void prg_usage() exit(1); } +static void testcheck_end(int ret, int *failed, int *fail_count, char *msg) +{ + if (ret != 0) { + *failed = TRUE; + *fail_count++; + tst_resm(TFAIL, msg); + } else + tst_resm(TPASS, msg); +} + static void setup(void); static void cleanup(void); static int fd1 = -1; @@ -290,12 +300,7 @@ int main(int argc, char *argv[]) count = bufsize; newfd = -1; ret = runtest_f(newfd, buf2, offset, count, EBADF, 5, "negative fd"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "Invalid file descriptor"); - } else - tst_resm(TPASS, "Invalid file descriptor"); + testcheck_end(ret, &failed, &fail_count, "Invalid file descriptor"); total++; /* Test-6: Out of range file descriptor */ @@ -306,15 +311,10 @@ int main(int argc, char *argv[]) failed = TRUE; tst_resm(TFAIL, "Out of range file descriptor"); } else { - ret = - runtest_f(newfd, buf2, offset, count, EBADF, 6, + ret = runtest_f(newfd, buf2, offset, count, EBADF, 6, "out of range fd"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "Out of range file descriptor"); - } else - tst_resm(TPASS, "Out of range file descriptor"); + testcheck_end(ret, &failed, &fail_count, + "Out of range file descriptor"); } close(newfd); total++; @@ -327,12 +327,7 @@ int main(int argc, char *argv[]) strerror(errno)); } ret = runtest_f(fd, buf2, offset, count, EBADF, 7, "closed fd"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "Closed file descriptor"); - } else - tst_resm(TPASS, "Closed file descriptor"); + testcheck_end(ret, &failed, &fail_count, "Closed file descriptor"); total++; /* Test-9: removed */ @@ -345,12 +340,8 @@ int main(int argc, char *argv[]) tst_resm(TCONF, "Direct I/O on /dev/null is not supported"); } else { ret = runtest_s(newfd, buf2, offset, count, 9, "/dev/null"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "character device read, write"); - } else - tst_resm(TPASS, "character device read, write"); + testcheck_end(ret, &failed, &fail_count, + "character device read, write"); } close(newfd); total++; @@ -373,12 +364,8 @@ int main(int argc, char *argv[]) strerror(errno)); } ret = runtest_s(fd, buf2, offset, count, 10, "mmapped file"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "read, write to a mmaped file"); - } else - tst_resm(TPASS, "read, write to a mmaped file"); + testcheck_end(ret, &failed, &fail_count, + "read, write to a mmaped file"); total++; /* Test-11: read, write to an unmaped file with munmap */ @@ -387,12 +374,8 @@ int main(int argc, char *argv[]) strerror(errno)); } ret = runtest_s(fd, buf2, offset, count, 11, "unmapped file"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "read, write to an unmapped file"); - } else - tst_resm(TPASS, "read, write to an unmapped file"); + testcheck_end(ret, &failed, &fail_count, + "read, write to an unmapped file"); close(fd); total++; @@ -478,12 +461,8 @@ int main(int argc, char *argv[]) l_fail = TRUE; } } - if (l_fail) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "read, write with non-aligned buffer"); - } else - tst_resm(TPASS, "read, write with non-aligned buffer"); + testcheck_end(l_fail, &failed, &fail_count, + "read, write with non-aligned buffer"); total++; close(fd); @@ -500,8 +479,7 @@ int main(int argc, char *argv[]) strerror(errno)); l_fail = TRUE; } else { - ret = - read(fd, (char *)((ulong) ADDRESS_OF_MAIN & pagemask), + ret = read(fd, (char *)((ulong) ADDRESS_OF_MAIN & pagemask), count); if (ret >= 0 || errno != EFAULT) { tst_resm(TFAIL, @@ -515,8 +493,7 @@ int main(int argc, char *argv[]) strerror(errno)); l_fail = TRUE; } else { - ret = - write(fd, (char *)((ulong) ADDRESS_OF_MAIN & pagemask), + ret = write(fd, (char *)((ulong) ADDRESS_OF_MAIN & pagemask), count); if (ret < 0) { tst_resm(TFAIL, @@ -525,12 +502,8 @@ int main(int argc, char *argv[]) l_fail = TRUE; } } - if (l_fail) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "read, write buffer in read-only space"); - } else - tst_resm(TPASS, "read, write buffer in read-only space"); + testcheck_end(l_fail, &failed, &fail_count, + "read, write buffer in read-only space"); close(fd); total++; @@ -545,15 +518,10 @@ int main(int argc, char *argv[]) tst_brkm(TBROK | TERRNO, cleanup, "open(%s, O_DIRECT|O_RDWR) failed", filename); } - ret = - runtest_f(fd, buf1, offset, count, EFAULT, 16, + ret = runtest_f(fd, buf1, offset, count, EFAULT, 16, " nonexistant space"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "read, write in non-existant space"); - } else - tst_resm(TPASS, "read, write in non-existant space"); + testcheck_end(ret, &failed, &fail_count, + "read, write in non-existant space"); total++; close(fd); @@ -565,12 +533,8 @@ int main(int argc, char *argv[]) "open(%s, O_DIRECT|O_RDWR|O_SYNC failed)", filename); } ret = runtest_s(fd, buf2, offset, count, 17, "opened with O_SYNC"); - if (ret != 0) { - failed = TRUE; - fail_count++; - tst_resm(TFAIL, "read, write for file with O_SYNC"); - } else - tst_resm(TPASS, "read, write for file with O_SYNC"); + testcheck_end(ret, &failed, &fail_count, + "read, write for file with O_SYNC"); total++; close(fd); -- 1.8.3.1 ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list