Fix testcase.
Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
diff --git a/testcases/kernel/syscalls/write/write01.c b/testcases/kernel/syscalls/write/write01.c
index b805b90..c30363a 100644
--- a/testcases/kernel/syscalls/write/write01.c
+++ b/testcases/kernel/syscalls/write/write01.c
@@ -139,64 +139,33 @@
int lc; /* loop counter */
char *msg; /* message returned from parse_opts */
- /***************************************************************
- * parse standard options
- ***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
+ if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
-
- /***************************************************************
- * perform global setup for test
- ***************************************************************/
setup();
- /* set the expected errnos... */
TEST_EXP_ENOS(exp_enos);
- /***************************************************************
- * check looping state if -c option given
- ***************************************************************/
for (lc = 0; TEST_LOOPING(lc); lc++) {
Tst_count = 0;
- /*
- * Call write(2)
- */
TEST(write(fd, &buf, 1));
- /* check return code */
- if (TEST_RETURN == -1) {
- TEST_ERROR_LOG(TEST_ERRNO);
- tst_resm(TFAIL,
- "write(%s, F_CLRALF, 1) Failed, errno=%d : %s",
- fname, TEST_ERRNO, strerror(TEST_ERRNO));
- } else {
- /***************************************************************
- * only perform functional verification if flag set (-f not given)
- ***************************************************************/
- if (STD_FUNCTIONAL_TEST) {
- /* No Verification test, yet... */
- tst_resm(TPASS,
- "write(%s, F_CLRALF, 1) returned %ld",
- fname, TEST_RETURN);
- }
- }
+ if (TEST_RETURN == -1)
+ tst_resm(TFAIL|TTERRNO, "write failed");
+ else
+ if (STD_FUNCTIONAL_TEST)
+ tst_resm(TPASS, "write returned %ld",
+ TEST_RETURN);
}
- /***************************************************************
- * cleanup and exit
- ***************************************************************/
cleanup();
+ tst_exit();
}
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
void setup()
{
@@ -207,31 +176,17 @@
tst_tmpdir();
sprintf(fname, "tfile_%d", getpid());
- if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1) {
- tst_brkm(TBROK, cleanup,
- "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
- fname, errno, strerror(errno));
- }
+ if ((fd = open(fname, O_RDWR | O_CREAT, 0700)) == -1)
+ tst_brkm(TBROK|TERRNO, cleanup, "open failed");
}
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- * completion or premature exit.
- ***************************************************************/
void cleanup()
{
- /*
- * print timing stats if that option was specified.
- * print errno log if that option was specified.
- */
TEST_CLEANUP;
- /* close the file we have open */
- if (close(fd) == -1) {
- tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno,
- strerror(errno));
- }
+ if (close(fd) == -1)
+ tst_resm(TWARN|TERRNO, "close failed");
tst_rmdir();
-}
\ No newline at end of file
+}