[LTP] [COMMITTED] [PATCH 1/9] syscalls/splice01: Convert to the new library

[LTP] [COMMITTED] [PATCH 1/9] syscalls/splice01: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/splice/splice01.c | 97 ++++++++++-------------------
 1 file changed, 32 insertions(+), 65 deletions(-)

diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
index 773639e1c..a975ccb9a 100644
--- a/testcases/kernel/syscalls/splice/splice01.c
+++ b/testcases/kernel/syscalls/splice/splice01.c
@@ -30,10 +30,8 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <sys/syscall.h>
 
-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/splice.h"
 
 #define TEST_BLOCK_SIZE 1024
@@ -41,37 +39,16 @@
 #define TESTFILE1 "splice_testfile_1"
 #define TESTFILE2 "splice_testfile_2"
 
-static void splice_test(void);
-static void setup(void);
-static void cleanup(void);
 static char buffer[TEST_BLOCK_SIZE];
 static int fd_in, fd_out;
 
-char *TCID = "splice01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++)
-		splice_test();
-
-	cleanup();
-	tst_exit();
-}
-
 static void check_file(void)
 {
 	int i;
 	char splicebuffer[TEST_BLOCK_SIZE];
 
-	fd_out = SAFE_OPEN(cleanup, TESTFILE2, O_RDONLY);
-	SAFE_READ(cleanup, 1, fd_out, splicebuffer, TEST_BLOCK_SIZE);
+	fd_out = SAFE_OPEN(TESTFILE2, O_RDONLY);
+	SAFE_READ(1, fd_out, splicebuffer, TEST_BLOCK_SIZE);
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++) {
 		if (buffer[i] != splicebuffer[i])
@@ -79,12 +56,11 @@ static void check_file(void)
 	}
 
 	if (i < TEST_BLOCK_SIZE)
-		tst_resm(TFAIL, "Wrong data read from the buffer at %i", i);
+		tst_res(TFAIL, "Wrong data read from the buffer@%i", i);
 	else
-		tst_resm(TPASS, "Written data has been read back correctly");
+		tst_res(TPASS, "Written data has been read back correctly");
 
-	close(fd_out);
-	fd_out = 0;
+	SAFE_CLOSE(fd_out);
 }
 
 static void splice_test(void)
@@ -92,25 +68,22 @@ static void splice_test(void)
 	int pipes[2];
 	int ret;
 
-	fd_in = SAFE_OPEN(cleanup, TESTFILE1, O_RDONLY);
-	SAFE_PIPE(cleanup, pipes);
-	fd_out = SAFE_OPEN(cleanup, TESTFILE2, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+	fd_in = SAFE_OPEN(TESTFILE1, O_RDONLY);
+	fd_out = SAFE_OPEN(TESTFILE2, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+	SAFE_PIPE(pipes);
 
 	ret = splice(fd_in, NULL, pipes[1], NULL, TEST_BLOCK_SIZE, 0);
 	if (ret < 0)
-		tst_brkm(TBROK | TERRNO, cleanup, "splice(fd_in, pipe) failed");
+		tst_brk(TBROK | TERRNO, "splice(fd_in, pipe) failed");
 
 	ret = splice(pipes[0], NULL, fd_out, NULL, TEST_BLOCK_SIZE, 0);
 	if (ret < 0)
-		tst_brkm(TBROK | TERRNO, cleanup, "splice(pipe, fd_out) failed");
+		tst_brk(TBROK | TERRNO, "splice(pipe, fd_out) failed");
 
-	close(fd_in);
-	close(fd_out);
-	close(pipes[0]);
-	close(pipes[1]);
-
-	fd_out = 0;
-	fd_in = 0;
+	SAFE_CLOSE(fd_in);
+	SAFE_CLOSE(fd_out);
+	SAFE_CLOSE(pipes[0]);
+	SAFE_CLOSE(pipes[1]);
 
 	check_file();
 }
@@ -119,39 +92,33 @@ static void setup(void)
 {
 	int i;
 
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, NULL,
-		         "The splice is supported 2.6.17 and newer");
-	}
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
+	if (tst_fs_type(".") == TST_NFS_MAGIC) {
 		if  (tst_kvercmp(2, 6, 32) < 0)
-			tst_brkm(TCONF, cleanup, "Cannot do splice on a file"
+			tst_brk(TCONF, "Cannot do splice on a file"
 				" on NFS filesystem before 2.6.32");
 	}
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
 
-	fd_in = SAFE_OPEN(cleanup, TESTFILE1, O_WRONLY | O_CREAT | O_TRUNC, 0777);
-	SAFE_WRITE(cleanup, 1, fd_in, buffer, TEST_BLOCK_SIZE);
-	SAFE_CLOSE(cleanup, fd_in);
-	fd_in = 0;
+	fd_in = SAFE_OPEN(TESTFILE1, O_WRONLY | O_CREAT | O_TRUNC, 0777);
+	SAFE_WRITE(1, fd_in, buffer, TEST_BLOCK_SIZE);
+	SAFE_CLOSE(fd_in);
 }
 
 static void cleanup(void)
 {
-	if (fd_in > 0 && close(fd_in))
-		tst_resm(TWARN, "Failed to close fd_in");
+	if (fd_in > 0)
+		SAFE_CLOSE(fd_in);
 
-	if (fd_out > 0 && close(fd_out))
-		tst_resm(TWARN, "Failed to close fd_out");
-
-	tst_rmdir();
+	if (fd_out > 0)
+		SAFE_CLOSE(fd_out);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test_all = splice_test,
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 2/9] syscalls/splice02: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 runtest/syscalls                            |  2 +-
 testcases/kernel/syscalls/splice/splice02.c | 60 +++++++----------------------
 2 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/runtest/syscalls b/runtest/syscalls
index e9dd3dec0..be617e337 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -1224,7 +1224,7 @@ socketpair02 socketpair02
 sockioctl01 sockioctl01
 
 splice01 splice01
-splice02 seq 1 20000 | splice02 splice02-temp
+splice02 seq 1 20000 | splice02
 splice03 splice03
 splice04 splice04
 splice05 splice05
diff --git a/testcases/kernel/syscalls/splice/splice02.c b/testcases/kernel/syscalls/splice/splice02.c
index d2f843ae7..a9ca51539 100644
--- a/testcases/kernel/syscalls/splice/splice02.c
+++ b/testcases/kernel/syscalls/splice/splice02.c
@@ -19,17 +19,7 @@
 /*                                                                            */
 /******************************************************************************/
 /******************************************************************************/
-/*                                                                            */
-/* File:        splice02.c                                                    */
-/*                                                                            */
 /* Description: This tests the splice() syscall                               */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* echo "Test splice()" > <outfile>; splice02 <outfile>                       */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   splice02                                                      */
 /******************************************************************************/
 #define _GNU_SOURCE
 
@@ -38,54 +28,30 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/splice.h"
 
-char *TCID = "splice02";
-int TST_TOTAL = 1;
-
-static void cleanup(void)
-{
-	tst_rmdir();
-}
-
-static void setup(void)
-{
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, cleanup, "This test can only run on kernels "
-			"that are 2.6.17 or higher");
-	}
-
-	TEST_PAUSE;
-	tst_tmpdir();
-}
-
 #define SPLICE_SIZE (64*1024)
 
-int main(int ac, char **av)
+static void splice_test(void)
 {
 	int fd;
 
-	setup();
-
-	if (ac < 2) {
-		tst_brkm(TFAIL, NULL, "%s failed - Usage: %s outfile", TCID,
-			 av[0]);
-	}
-
-	fd = SAFE_OPEN(cleanup, av[1], O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	fd = SAFE_OPEN("splice02-temp", O_WRONLY | O_CREAT | O_TRUNC, 0644);
 
 	TEST(splice(STDIN_FILENO, NULL, fd, NULL, SPLICE_SIZE, 0));
 	if (TEST_RETURN < 0) {
-		tst_resm(TFAIL, "splice failed - errno = %d : %s",
-			 TEST_ERRNO, strerror(TEST_ERRNO));
+		tst_res(TFAIL, "splice failed - errno = %d : %s",
+			TEST_ERRNO, strerror(TEST_ERRNO));
 	} else {
-		tst_resm(TPASS, "splice() system call Passed");
+		tst_res(TPASS, "splice() system call Passed");
 	}
 
-	SAFE_CLOSE(cleanup, fd);
-
-	cleanup();
-	tst_exit();
+	SAFE_CLOSE(fd);
 }
+
+static struct tst_test test = {
+	.test_all = splice_test,
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 3/9] syscalls/splice03: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/splice/splice03.c | 111 ++++++++++------------------
 1 file changed, 40 insertions(+), 71 deletions(-)

diff --git a/testcases/kernel/syscalls/splice/splice03.c b/testcases/kernel/syscalls/splice/splice03.c
index b18c52a46..86363dd96 100644
--- a/testcases/kernel/syscalls/splice/splice03.c
+++ b/testcases/kernel/syscalls/splice/splice03.c
@@ -40,8 +40,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/splice.h"
 
 #define TEST_FILE "testfile"
@@ -58,13 +57,13 @@ static int appendfd;
 static int pipes[2];
 static loff_t offset;
 
-static struct test_case_t {
+static struct tcase {
 	int *fdin;
 	loff_t *offin;
 	int *fdout;
 	loff_t *offout;
 	int exp_errno;
-} test_cases[] = {
+} tcases[] = {
 	{ &badfd, NULL, &pipes[1], NULL, EBADF },
 	{ &pipes[0], NULL, &badfd, NULL, EBADF },
 	{ &wrfd, NULL, &pipes[1], NULL, EBADF },
@@ -74,96 +73,66 @@ static struct test_case_t {
 	{ &rdfd, NULL, &pipes[1], &offset, ESPIPE },
 };
 
-static void setup(void);
-static void cleanup(void);
-static void splice_verify(const struct test_case_t *);
-
-char *TCID = "splice03";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
+static void setup(void)
 {
-	int i, lc;
+	SAFE_FILE_PRINTF(TEST_FILE, STR);
+	rdfd = SAFE_OPEN(TEST_FILE, O_RDONLY);
 
-	tst_parse_opts(ac, av, NULL, NULL);
+	wrfd = SAFE_OPEN(TEST_FILE2, O_WRONLY | O_CREAT, 0644);
 
-	setup();
+	appendfd = SAFE_OPEN(TEST_FILE3, O_RDWR | O_CREAT | O_APPEND, 0644);
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
+	SAFE_PIPE(pipes);
 
-		for (i = 0; i < TST_TOTAL; i++)
-			splice_verify(&test_cases[i]);
-	}
-
-	cleanup();
-	tst_exit();
+	SAFE_WRITE(1, pipes[1], STR, sizeof(STR) - 1);
 }
 
-void setup(void)
+static void splice_verify(unsigned int n)
 {
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, cleanup, "This test can only run on kernels "
-			"that are 2.6.17 or higher");
-	}
-
-	TEST_PAUSE;
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	SAFE_FILE_PRINTF(cleanup, TEST_FILE, STR);
-	rdfd = SAFE_OPEN(cleanup, TEST_FILE, O_RDONLY);
-
-	wrfd = SAFE_OPEN(cleanup, TEST_FILE2,
-		O_WRONLY | O_CREAT, 0644);
+	struct tcase *tc = &tcases[n];
 
-	appendfd = SAFE_OPEN(cleanup, TEST_FILE3,
-		O_RDWR | O_CREAT | O_APPEND, 0644);
-
-	SAFE_PIPE(cleanup, pipes);
-
-	SAFE_WRITE(cleanup, 1, pipes[1], STR, sizeof(STR) - 1);
-}
-
-static void splice_verify(const struct test_case_t *tc)
-{
 	TEST(splice(*(tc->fdin), tc->offin, *(tc->fdout),
 		tc->offout, SPLICE_TEST_LEN, 0));
 
 	if (TEST_RETURN != -1) {
-		tst_resm(TFAIL, "splice() returned %ld, "
-			"expected -1, errno:%d", TEST_RETURN,
-			tc->exp_errno);
+		tst_res(TFAIL, "splice() returned %ld expected %s",
+			TEST_RETURN, tst_strerrno(tc->exp_errno));
 		return;
 	}
 
-	if (TEST_ERRNO == tc->exp_errno) {
-		tst_resm(TPASS | TTERRNO, "splice() failed as expected");
-	} else {
-		tst_resm(TFAIL | TTERRNO,
+	if (TEST_ERRNO != tc->exp_errno) {
+		tst_res(TFAIL | TTERRNO,
 			"splice() failed unexpectedly; expected: %d - %s",
-			tc->exp_errno, strerror(tc->exp_errno));
+			tc->exp_errno, tst_strerrno(tc->exp_errno));
+		return;
 	}
+
+	tst_res(TPASS | TTERRNO, "splice() failed as expected");
 }
 
-void cleanup(void)
+static void cleanup(void)
 {
-	if (rdfd && close(rdfd) < 0)
-		tst_resm(TWARN | TERRNO, "close rdfd failed");
-
-	if (wrfd && close(wrfd) < 0)
-		tst_resm(TWARN | TERRNO, "close wrfd failed");
+	if (rdfd > 0)
+		SAFE_CLOSE(rdfd);
 
-	if (appendfd && close(appendfd) < 0)
-		tst_resm(TWARN | TERRNO, "close appendfd failed");
+	if (wrfd > 0)
+		SAFE_CLOSE(wrfd);
 
-	if (pipes[0] && close(pipes[0]) < 0)
-		tst_resm(TWARN | TERRNO, "close pipes[0] failed");
+	if (appendfd > 0)
+		SAFE_CLOSE(appendfd);
 
-	if (pipes[1] && close(pipes[1]) < 0)
-		tst_resm(TWARN | TERRNO, "close pipes[1] failed");
+	if (pipes[0] > 0)
+		SAFE_CLOSE(pipes[0]);
 
-	tst_rmdir();
+	if (pipes[1] > 0)
+		SAFE_CLOSE(pipes[1]);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test = splice_verify,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 4/9] syscalls/tee01: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/tee/tee01.c | 107 ++++++++++++----------------------
 1 file changed, 36 insertions(+), 71 deletions(-)

diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index ee337f868..7e64779ba 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -31,19 +31,12 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <sys/syscall.h>
 
-#include "test.h"
-#include "lapi/syscalls.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/fcntl.h"
 #include "lapi/tee.h"
 #include "lapi/splice.h"
 
-static void tee_test(void);
-static void setup(void);
-static void cleanup(void);
-
 #define TEST_BLOCK_SIZE 1024
 
 #define TESTFILE1 "tee_test_file_1"
@@ -52,31 +45,13 @@ static void cleanup(void);
 static int fd_in, fd_out;
 static char buffer[TEST_BLOCK_SIZE];
 
-char *TCID = "tee01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++)
-		tee_test();
-
-	cleanup();
-	tst_exit();
-}
-
 static void check_file(void)
 {
 	int i;
 	char teebuffer[TEST_BLOCK_SIZE];
 
-	fd_out = SAFE_OPEN(cleanup, TESTFILE2, O_RDONLY);
-	SAFE_READ(cleanup, 1, fd_out, teebuffer, TEST_BLOCK_SIZE);
+	fd_out = SAFE_OPEN(TESTFILE2, O_RDONLY);
+	SAFE_READ(1, fd_out, teebuffer, TEST_BLOCK_SIZE);
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++) {
 		if (buffer[i] != teebuffer[i])
@@ -84,12 +59,11 @@ static void check_file(void)
 	}
 
 	if (i < TEST_BLOCK_SIZE)
-		tst_resm(TFAIL, "Wrong data read from the buffer at %i", i);
+		tst_res(TFAIL, "Wrong data read from the buffer@%i", i);
 	else
-		tst_resm(TPASS, "Written data has been read back correctly");
+		tst_res(TPASS, "Written data has been read back correctly");
 
-	close(fd_out);
-	fd_out = 0;
+	SAFE_CLOSE(fd_out);
 }
 
 static void tee_test(void)
@@ -98,33 +72,30 @@ static void tee_test(void)
 	int pipe2[2];
 	int ret = 0;
 
-	fd_in = SAFE_OPEN(cleanup, TESTFILE1, O_RDONLY);
-	fd_out = SAFE_OPEN(cleanup, TESTFILE2, O_WRONLY | O_CREAT | O_TRUNC, 0777);
+	fd_in = SAFE_OPEN(TESTFILE1, O_RDONLY);
+	fd_out = SAFE_OPEN(TESTFILE2, O_WRONLY | O_CREAT | O_TRUNC, 0777);
 
-	SAFE_PIPE(cleanup, pipe1);
-	SAFE_PIPE(cleanup, pipe2);
+	SAFE_PIPE(pipe1);
+	SAFE_PIPE(pipe2);
 
 	ret = splice(fd_in, NULL, pipe1[1], NULL, TEST_BLOCK_SIZE, 0);
 	if (ret < 0)
-		tst_brkm(TBROK | TERRNO, cleanup, "splice(fd_in, pipe1) failed");
+		tst_brk(TBROK | TERRNO, "splice(fd_in, pipe1) failed");
 
 	ret = tee(pipe1[0], pipe2[1], TEST_BLOCK_SIZE, SPLICE_F_NONBLOCK);
 	if (ret < 0)
-		tst_brkm(TBROK | TERRNO, cleanup, "tee() failed");
+		tst_brk(TBROK | TERRNO, "tee() failed");
 
 	ret = splice(pipe2[0], NULL, fd_out, NULL, TEST_BLOCK_SIZE, 0);
 	if (ret < 0)
-		tst_brkm(TBROK | TERRNO, cleanup, "splice(pipe2, fd_out) failed");
+		tst_brk(TBROK | TERRNO, "splice(pipe2, fd_out) failed");
 
-	close(pipe2[0]);
-	close(pipe2[1]);
-	close(pipe1[0]);
-	close(pipe1[1]);
-	close(fd_out);
-	close(fd_in);
-
-	fd_out = 0;
-	fd_in = 0;
+	SAFE_CLOSE(pipe2[0]);
+	SAFE_CLOSE(pipe2[1]);
+	SAFE_CLOSE(pipe1[0]);
+	SAFE_CLOSE(pipe1[1]);
+	SAFE_CLOSE(fd_out);
+	SAFE_CLOSE(fd_in);
 
 	check_file();
 }
@@ -133,39 +104,33 @@ static void setup(void)
 {
 	int i;
 
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, cleanup, "This test can only run on kernels "
-			"that are 2.6.17 or higher");
-	}
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
+	if (tst_fs_type(".") == TST_NFS_MAGIC) {
 		if ((tst_kvercmp(2, 6, 32)) < 0)
-			tst_brkm(TCONF, cleanup, "Cannot do tee on a file"
+			tst_brk(TCONF, "Cannot do tee on a file"
 				" on NFS filesystem before 2.6.32");
 	}
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
 
-	fd_in = SAFE_OPEN(cleanup, TESTFILE1, O_WRONLY | O_CREAT | O_TRUNC, 0777);
-	SAFE_WRITE(cleanup, 1, fd_in, buffer, TEST_BLOCK_SIZE);
-	SAFE_CLOSE(cleanup, fd_in);
-	fd_in = 0;
+	fd_in = SAFE_OPEN(TESTFILE1, O_WRONLY | O_CREAT | O_TRUNC, 0777);
+	SAFE_WRITE(1, fd_in, buffer, TEST_BLOCK_SIZE);
+	SAFE_CLOSE(fd_in);
 }
 
 static void cleanup(void)
 {
-	if (fd_in > 0 && close(fd_in))
-		tst_resm(TWARN, "Failed to close fd_in");
+	if (fd_in > 0)
+		SAFE_CLOSE(fd_in);
 
-	if (fd_out > 0 && close(fd_out))
-		tst_resm(TWARN, "Failed to close fd_out");
-
-	tst_rmdir();
+	if (fd_out > 0)
+		SAFE_CLOSE(fd_out);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test_all = tee_test,
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 5/9] syscalls/tee02: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/tee/tee02.c | 91 ++++++++++++-----------------------
 1 file changed, 31 insertions(+), 60 deletions(-)

diff --git a/testcases/kernel/syscalls/tee/tee02.c b/testcases/kernel/syscalls/tee/tee02.c
index 2173cd23c..d454f4adb 100644
--- a/testcases/kernel/syscalls/tee/tee02.c
+++ b/testcases/kernel/syscalls/tee/tee02.c
@@ -32,8 +32,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/tee.h"
 
 #define TEST_FILE "testfile"
@@ -44,91 +43,63 @@
 static int fd;
 static int pipes[2];
 
-static struct test_case_t {
+static struct tcase {
 	int *fdin;
 	int *fdout;
 	int exp_errno;
-} test_cases[] = {
+} tcases[] = {
 	{ &fd, &pipes[1], EINVAL },
 	{ &pipes[0], &fd, EINVAL },
 	{ &pipes[0], &pipes[1], EINVAL },
 };
 
-static void setup(void);
-static void cleanup(void);
-static void tee_verify(const struct test_case_t *);
-
-char *TCID = "tee02";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
-{
-	int i, lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++)
-			tee_verify(&test_cases[i]);
-	}
-
-	cleanup();
-	tst_exit();
-}
-
 static void setup(void)
 {
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, cleanup, "This test can only run on kernels "
-			"that are 2.6.17 or higher");
-	}
-
-	TEST_PAUSE;
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	fd = SAFE_OPEN(cleanup, TEST_FILE, O_RDWR | O_CREAT);
-
-	SAFE_PIPE(cleanup, pipes);
-	SAFE_WRITE(cleanup, 1, pipes[1], STR, sizeof(STR) - 1);
+	fd = SAFE_OPEN(TEST_FILE, O_RDWR | O_CREAT);
+	SAFE_PIPE(pipes);
+	SAFE_WRITE(1, pipes[1], STR, sizeof(STR) - 1);
 }
 
-static void tee_verify(const struct test_case_t *tc)
+static void tee_verify(unsigned int n)
 {
+	struct tcase *tc = &tcases[n];
+
 	TEST(tee(*(tc->fdin), *(tc->fdout), TEE_TEST_LEN, 0));
 
 	if (TEST_RETURN != -1) {
-		tst_resm(TFAIL, "tee() returned %ld, "
+		tst_res(TFAIL, "tee() returned %ld, "
 			"expected -1, errno:%d", TEST_RETURN,
 			tc->exp_errno);
 		return;
 	}
 
-	if (TEST_ERRNO == tc->exp_errno) {
-		tst_resm(TPASS | TTERRNO, "tee() failed as expected");
-	} else {
-		tst_resm(TFAIL | TTERRNO,
+	if (TEST_ERRNO != tc->exp_errno) {
+		tst_res(TFAIL | TTERRNO,
 			"tee() failed unexpectedly; expected: %d - %s",
-			tc->exp_errno, strerror(tc->exp_errno));
+			tc->exp_errno, tst_strerrno(tc->exp_errno));
+		return;
 	}
+
+	tst_res(TPASS | TTERRNO, "tee() failed as expected");
 }
 
 static void cleanup(void)
 {
-	if (fd && close(fd) < 0)
-		tst_resm(TWARN | TERRNO, "close fd failed");
-
-	if (pipes[0] && close(pipes[0]) < 0)
-		tst_resm(TWARN | TERRNO, "close pipes[0] failed");
+	if (fd > 0)
+		SAFE_CLOSE(fd);
 
-	if (pipes[1] && close(pipes[1]) < 0)
-		tst_resm(TWARN | TERRNO, "close pipes[1] failed");
+	if (pipes[0] > 0)
+		SAFE_CLOSE(pipes[0]);
 
-	tst_rmdir();
+	if (pipes[1] > 0)
+		SAFE_CLOSE(pipes[1]);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test = tee_verify,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITED] [PATCH 6/9] syscalls/vmsplice01: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/vmsplice/vmsplice01.c | 83 ++++++++-----------------
 1 file changed, 26 insertions(+), 57 deletions(-)

diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
index ef3d80bb1..882e198a6 100644
--- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c
+++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
@@ -33,49 +33,25 @@
 #include <fcntl.h>
 #include <sys/poll.h>
 
-#include "test.h"
-#include "lapi/syscalls.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/fcntl.h"
 #include "lapi/splice.h"
 #include "lapi/vmsplice.h"
 
 #define TEST_BLOCK_SIZE (1<<17)	/* 128K */
 
-static void vmsplice_test(void);
-static void setup(void);
-static void cleanup(void);
-
 #define TESTFILE "vmsplice_test_file"
 
 static int fd_out;
 static char buffer[TEST_BLOCK_SIZE];
 
-char *TCID = "vmsplice01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++)
-		vmsplice_test();
-
-	cleanup();
-	tst_exit();
-}
-
 static void check_file(void)
 {
 	int i;
 	char vmsplicebuffer[TEST_BLOCK_SIZE];
 
-	fd_out = SAFE_OPEN(cleanup, TESTFILE, O_RDONLY);
-	SAFE_READ(cleanup, 1, fd_out, vmsplicebuffer, TEST_BLOCK_SIZE);
+	fd_out = SAFE_OPEN(TESTFILE, O_RDONLY);
+	SAFE_READ(1, fd_out, vmsplicebuffer, TEST_BLOCK_SIZE);
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++) {
 		if (buffer[i] != vmsplicebuffer[i])
@@ -83,12 +59,11 @@ static void check_file(void)
 	}
 
 	if (i < TEST_BLOCK_SIZE)
-		tst_resm(TFAIL, "Wrong data read from the buffer at %i", i);
+		tst_res(TFAIL, "Wrong data read from the buffer@%i", i);
 	else
-		tst_resm(TPASS, "Written data has been read back correctly");
+		tst_res(TPASS, "Written data has been read back correctly");
 
-	close(fd_out);
-	fd_out = 0;
+	SAFE_CLOSE(fd_out);
 }
 
 static void vmsplice_test(void)
@@ -103,8 +78,8 @@ static void vmsplice_test(void)
 	v.iov_base = buffer;
 	v.iov_len = TEST_BLOCK_SIZE;
 
-	SAFE_PIPE(cleanup, pipes);
-	fd_out = SAFE_OPEN(cleanup, TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	fd_out = SAFE_OPEN(TESTFILE, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+	SAFE_PIPE(pipes);
 
 	struct pollfd pfd = {.fd = pipes[1], .events = POLLOUT};
 	offset = 0;
@@ -116,11 +91,11 @@ static void vmsplice_test(void)
 		 * not using the free time for anything interesting.
 		 */
 		if (poll(&pfd, 1, -1) < 0)
-			tst_brkm(TBROK | TERRNO, cleanup, "poll() failed");
+			tst_brk(TBROK | TERRNO, "poll() failed");
 
 		written = vmsplice(pipes[1], &v, 1, 0);
 		if (written < 0) {
-			tst_brkm(TBROK | TERRNO, cleanup, "vmsplice() failed");
+			tst_brk(TBROK | TERRNO, "vmsplice() failed");
 		} else {
 			if (written == 0) {
 				break;
@@ -132,14 +107,13 @@ static void vmsplice_test(void)
 
 		ret = splice(pipes[0], NULL, fd_out, &offset, written, 0);
 		if (ret < 0)
-			tst_brkm(TBROK | TERRNO, cleanup, "splice() failed");
+			tst_brk(TBROK | TERRNO, "splice() failed");
 		//printf("offset = %lld\n", (long long)offset);
 	}
 
-	close(pipes[0]);
-	close(pipes[1]);
-	close(fd_out);
-	fd_out = 0;
+	SAFE_CLOSE(pipes[0]);
+	SAFE_CLOSE(pipes[1]);
+	SAFE_CLOSE(fd_out);
 
 	check_file();
 }
@@ -148,30 +122,25 @@ static void setup(void)
 {
 	int i;
 
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, NULL,
-		         "The vmsplice is supported 2.6.17 and newer");
-	}
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	tst_tmpdir();
-
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup, "Cannot do splice() "
+	if (tst_fs_type(".") == TST_NFS_MAGIC) {
+		tst_brk(TCONF, "Cannot do splice() "
 			 "on a file located on an NFS filesystem");
 	}
 
 	for (i = 0; i < TEST_BLOCK_SIZE; i++)
 		buffer[i] = i & 0xff;
-
-	TEST_PAUSE;
 }
 
 static void cleanup(void)
 {
-	if (fd_out > 0 && close(fd_out))
-		tst_resm(TWARN, "Failed to close fd_out");
-
-	tst_rmdir();
+	if (fd_out > 0)
+		SAFE_CLOSE(fd_out);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test_all = vmsplice_test,
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 7/9] syscalls/vmsplice02: Convert to the new library

[Cyril Hrubis]

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/vmsplice/vmsplice02.c | 93 +++++++++----------------
 1 file changed, 32 insertions(+), 61 deletions(-)

diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice02.c b/testcases/kernel/syscalls/vmsplice/vmsplice02.c
index 730b0fa64..1e100a143 100644
--- a/testcases/kernel/syscalls/vmsplice/vmsplice02.c
+++ b/testcases/kernel/syscalls/vmsplice/vmsplice02.c
@@ -35,8 +35,7 @@
 #include <sys/uio.h>
 #include <limits.h>
 
-#include "test.h"
-#include "safe_macros.h"
+#include "tst_test.h"
 #include "lapi/syscalls.h"
 #include "lapi/fcntl.h"
 #include "lapi/vmsplice.h"
@@ -51,100 +50,72 @@ static int filefd;
 static int pipes[2];
 static struct iovec ivc;
 
-static struct test_case_t {
+static struct tcase {
 	int *fd;
 	const struct iovec *iov;
 	unsigned long nr_segs;
 	int exp_errno;
-} test_cases[] = {
+} tcases[] = {
 	{ &notvalidfd, &ivc, 1, EBADF },
 	{ &filefd, &ivc, 1, EBADF },
 	{ &pipes[1], &ivc, IOV_MAX + 1, EINVAL },
 };
 
-static void setup(void);
-static void cleanup(void);
-static void vmsplice_verify(const struct test_case_t *);
-
-char *TCID = "vmsplice02";
-int TST_TOTAL = ARRAY_SIZE(test_cases);
-
-int main(int ac, char **av)
-{
-	int i, lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		for (i = 0; i < TST_TOTAL; i++)
-			vmsplice_verify(&test_cases[i]);
-	}
-
-	cleanup();
-	tst_exit();
-}
-
 static void setup(void)
 {
-	if ((tst_kvercmp(2, 6, 17)) < 0) {
-		tst_brkm(TCONF, cleanup, "This test can only run on "
-			"kernels that are 2.6.17 or higher");
-	}
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
-	if (tst_fs_type(cleanup, ".") == TST_NFS_MAGIC) {
-		tst_brkm(TCONF, cleanup, "Cannot do splice() "
+	if (tst_fs_type(".") == TST_NFS_MAGIC) {
+		tst_brk(TCONF, "Cannot do splice() "
 			"on a file located on an NFS filesystem");
 	}
 
-	filefd = SAFE_OPEN(cleanup, TESTFILE,
-				O_WRONLY | O_CREAT, 0644);
+	filefd = SAFE_OPEN(TESTFILE, O_WRONLY | O_CREAT, 0644);
 
-	SAFE_PIPE(cleanup, pipes);
+	SAFE_PIPE(pipes);
 
 	ivc.iov_base = buffer;
 	ivc.iov_len = TEST_BLOCK_SIZE;
 }
 
-static void vmsplice_verify(const struct test_case_t *tc)
+static void vmsplice_verify(unsigned int n)
 {
+	struct tcase *tc = &tcases[n];
+
 	TEST(vmsplice(*(tc->fd), tc->iov, tc->nr_segs, 0));
 
 	if (TEST_RETURN != -1) {
-		tst_resm(TFAIL, "vmsplice() returned %ld, "
+		tst_res(TFAIL, "vmsplice() returned %ld, "
 			"expected -1, errno:%d", TEST_RETURN,
 			tc->exp_errno);
 		return;
 	}
 
-	if (TEST_ERRNO == tc->exp_errno) {
-		tst_resm(TPASS | TTERRNO, "vmsplice() failed as expected");
-	} else {
-		tst_resm(TFAIL | TTERRNO,
+	if (TEST_ERRNO != tc->exp_errno) {
+		tst_res(TFAIL | TTERRNO,
 			"vmsplice() failed unexpectedly; expected: %d - %s",
-			tc->exp_errno, strerror(tc->exp_errno));
+			tc->exp_errno, tst_strerrno(tc->exp_errno));
+		return;
 	}
+
+	tst_res(TPASS | TTERRNO, "vmsplice() failed as expected");
 }
 
 static void cleanup(void)
 {
-	if (filefd && close(filefd) < 0)
-		tst_resm(TWARN | TERRNO, "close filefd failed");
-
-	if (pipes[0] && close(pipes[0]) < 0)
-		tst_resm(TWARN | TERRNO, "close pipes[0] failed");
+	if (filefd > 0)
+		SAFE_CLOSE(filefd);
 
-	if (pipes[1] && close(pipes[1]) < 0)
-		tst_resm(TWARN | TERRNO, "close pipes[1] failed");
+	if (pipes[0] > 0)
+		SAFE_CLOSE(pipes[0]);
 
-	tst_rmdir();
+	if (pipes[1] > 0)
+		SAFE_CLOSE(pipes[1]);
 }
+
+static struct tst_test test = {
+	.setup = setup,
+	.cleanup = cleanup,
+	.test = vmsplice_verify,
+	.tcnt = ARRAY_SIZE(tcases),
+	.needs_tmpdir = 1,
+	.min_kver = "2.6.17",
+};
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 8/9] lapi/{vmsplice.h, splice.h, tee.h}: Switch to tst_syscall()

[Cyril Hrubis]

Now that all splice tests are converted.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 include/lapi/splice.h   | 2 +-
 include/lapi/tee.h      | 2 +-
 include/lapi/vmsplice.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/lapi/splice.h b/include/lapi/splice.h
index ffc0fd6d0..8ac8bd47f 100644
--- a/include/lapi/splice.h
+++ b/include/lapi/splice.h
@@ -28,7 +28,7 @@
 ssize_t splice(int fd_in, loff_t *off_in, int fd_out,
 	loff_t *off_out, size_t len, unsigned int flags)
 {
-	return ltp_syscall(__NR_splice, fd_in, off_in,
+	return tst_syscall(__NR_splice, fd_in, off_in,
 		fd_out, off_out, len, flags);
 }
 #endif
diff --git a/include/lapi/tee.h b/include/lapi/tee.h
index fe79a8f0a..1d9819581 100644
--- a/include/lapi/tee.h
+++ b/include/lapi/tee.h
@@ -26,7 +26,7 @@
 #if !defined(HAVE_TEE)
 ssize_t tee(int fd_in, int fd_out, size_t len, unsigned int flags)
 {
-	return ltp_syscall(__NR_tee, fd_in, fd_out, len, flags);
+	return tst_syscall(__NR_tee, fd_in, fd_out, len, flags);
 }
 #endif
 
diff --git a/include/lapi/vmsplice.h b/include/lapi/vmsplice.h
index 5842d1749..d8b710fdd 100644
--- a/include/lapi/vmsplice.h
+++ b/include/lapi/vmsplice.h
@@ -30,7 +30,7 @@
 ssize_t vmsplice(int fd, const struct iovec *iov,
 	         unsigned long nr_segs, unsigned int flags)
 {
-	return ltp_syscall(__NR_vmsplice, fd, iov, nr_segs, flags);
+	return tst_syscall(__NR_vmsplice, fd, iov, nr_segs, flags);
 }
 #endif
 
-- 
2.13.0

[LTP] [COMMITTED] [PATCH 9/9] syscalls/splice{04, 05}: Include lapi/splice.h

[Cyril Hrubis]

Fixes compilation on older distros.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/kernel/syscalls/splice/splice04.c | 1 +
 testcases/kernel/syscalls/splice/splice05.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/testcases/kernel/syscalls/splice/splice04.c b/testcases/kernel/syscalls/splice/splice04.c
index dbdc1048f..852dd0569 100644
--- a/testcases/kernel/syscalls/splice/splice04.c
+++ b/testcases/kernel/syscalls/splice/splice04.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include "tst_test.h"
+#include "lapi/splice.h"
 #include "splice.h"
 
 #define PIPE_MAX (64*1024)
diff --git a/testcases/kernel/syscalls/splice/splice05.c b/testcases/kernel/syscalls/splice/splice05.c
index 4cd1c5f6a..b8ee49cfd 100644
--- a/testcases/kernel/syscalls/splice/splice05.c
+++ b/testcases/kernel/syscalls/splice/splice05.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "tst_test.h"
+#include "lapi/splice.h"
 #include "splice.h"
 
 #define PIPE_MAX (64*1024)
-- 
2.13.0