Introduce tst_parse_opts()
The pattern that was used in all testcases is:
const char *msg;
msg = parse_opts(...);
if (msg)
tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
This change simplifies the steps to just calling:
tst_parse_opts(...);
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/testcases/kernel/containers/mountns/mountns01.c b/testcases/kernel/containers/mountns/mountns01.c
index d50cbba..4440325 100644
--- a/testcases/kernel/containers/mountns/mountns01.c
+++ b/testcases/kernel/containers/mountns/mountns01.c
@@ -132,12 +132,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/mountns/mountns02.c b/testcases/kernel/containers/mountns/mountns02.c
index 56533c0..89858e6 100644
--- a/testcases/kernel/containers/mountns/mountns02.c
+++ b/testcases/kernel/containers/mountns/mountns02.c
@@ -132,12 +132,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/mountns/mountns03.c b/testcases/kernel/containers/mountns/mountns03.c
index 8457faf..1ac68e2 100644
--- a/testcases/kernel/containers/mountns/mountns03.c
+++ b/testcases/kernel/containers/mountns/mountns03.c
@@ -149,12 +149,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/mountns/mountns04.c b/testcases/kernel/containers/mountns/mountns04.c
index c7a3af5..5155900 100644
--- a/testcases/kernel/containers/mountns/mountns04.c
+++ b/testcases/kernel/containers/mountns/mountns04.c
@@ -72,12 +72,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/netns/netns_netlink.c b/testcases/kernel/containers/netns/netns_netlink.c
index 478536c..cfa780e 100644
--- a/testcases/kernel/containers/netns/netns_netlink.c
+++ b/testcases/kernel/containers/netns/netns_netlink.c
@@ -167,12 +167,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/pidns/pidns03.c b/testcases/kernel/containers/pidns/pidns03.c
index 16d20d7..ecd2627 100644
--- a/testcases/kernel/containers/pidns/pidns03.c
+++ b/testcases/kernel/containers/pidns/pidns03.c
@@ -107,12 +107,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/sysvipc/msg_comm.c b/testcases/kernel/containers/sysvipc/msg_comm.c
index 80409d4..8e21cfd 100644
--- a/testcases/kernel/containers/sysvipc/msg_comm.c
+++ b/testcases/kernel/containers/sysvipc/msg_comm.c
@@ -166,12 +166,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/sysvipc/sem_comm.c b/testcases/kernel/containers/sysvipc/sem_comm.c
index b44be6d..157ba0c 100644
--- a/testcases/kernel/containers/sysvipc/sem_comm.c
+++ b/testcases/kernel/containers/sysvipc/sem_comm.c
@@ -174,12 +174,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/containers/sysvipc/shm_comm.c b/testcases/kernel/containers/sysvipc/shm_comm.c
index 16823a2..6836ebc 100644
--- a/testcases/kernel/containers/sysvipc/shm_comm.c
+++ b/testcases/kernel/containers/sysvipc/shm_comm.c
@@ -154,12 +154,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c b/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c
index bb28e02..d21656f 100644
--- a/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c
+++ b/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c
@@ -140,10 +140,7 @@
void setup(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
tst_require_root(NULL);
diff --git a/testcases/kernel/device-drivers/acpi/ltp_acpi.c b/testcases/kernel/device-drivers/acpi/ltp_acpi.c
index 74e025f..47802d2 100644
--- a/testcases/kernel/device-drivers/acpi/ltp_acpi.c
+++ b/testcases/kernel/device-drivers/acpi/ltp_acpi.c
@@ -142,10 +142,7 @@
int main(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
tst_require_root(NULL);
diff --git a/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c b/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c
index c483544..82bbab6 100644
--- a/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c
+++ b/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c
@@ -57,10 +57,7 @@
void setup(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
tst_require_root(NULL);
diff --git a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c
index 481f04a..d5ef0d8 100644
--- a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c
+++ b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c
@@ -166,10 +166,7 @@
int main(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/device-drivers/rtc/rtc01.c b/testcases/kernel/device-drivers/rtc/rtc01.c
index 2eecc62..1870526 100644
--- a/testcases/kernel/device-drivers/rtc/rtc01.c
+++ b/testcases/kernel/device-drivers/rtc/rtc01.c
@@ -210,10 +210,7 @@
int main(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
tst_require_root(NULL);
diff --git a/testcases/kernel/device-drivers/uaccess/uaccess.c b/testcases/kernel/device-drivers/uaccess/uaccess.c
index c7b20c5..45f9d80 100644
--- a/testcases/kernel/device-drivers/uaccess/uaccess.c
+++ b/testcases/kernel/device-drivers/uaccess/uaccess.c
@@ -93,10 +93,7 @@
int main(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
tst_require_root(NULL);
diff --git a/testcases/kernel/firmware/fw_load_user/fw_load.c b/testcases/kernel/firmware/fw_load_user/fw_load.c
index 84f55d7..f4bc3ea 100644
--- a/testcases/kernel/firmware/fw_load_user/fw_load.c
+++ b/testcases/kernel/firmware/fw_load_user/fw_load.c
@@ -102,10 +102,8 @@
void setup(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+ tst_parse_opts(argc, argv, options, help);
if (nflag) {
if (sscanf(narg, "%i", &fw_size) != 1)
diff --git a/testcases/kernel/fs/ftest/ftest01.c b/testcases/kernel/fs/ftest/ftest01.c
index 099609a..d3390f0 100644
--- a/testcases/kernel/fs/ftest/ftest01.c
+++ b/testcases/kernel/fs/ftest/ftest01.c
@@ -96,10 +96,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/fs/ftest/ftest03.c b/testcases/kernel/fs/ftest/ftest03.c
index 75aa144..10e2a4a 100644
--- a/testcases/kernel/fs/ftest/ftest03.c
+++ b/testcases/kernel/fs/ftest/ftest03.c
@@ -102,10 +102,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/fs/ftest/ftest04.c b/testcases/kernel/fs/ftest/ftest04.c
index 31f3e10..c00fdfc 100644
--- a/testcases/kernel/fs/ftest/ftest04.c
+++ b/testcases/kernel/fs/ftest/ftest04.c
@@ -83,10 +83,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/fs/ftest/ftest05.c b/testcases/kernel/fs/ftest/ftest05.c
index 2b7ad13..13ae676 100644
--- a/testcases/kernel/fs/ftest/ftest05.c
+++ b/testcases/kernel/fs/ftest/ftest05.c
@@ -100,10 +100,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/fs/ftest/ftest06.c b/testcases/kernel/fs/ftest/ftest06.c
index 809b0d7..780cdbc 100644
--- a/testcases/kernel/fs/ftest/ftest06.c
+++ b/testcases/kernel/fs/ftest/ftest06.c
@@ -103,13 +103,11 @@
char name[3];
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Default values for run conditions.
diff --git a/testcases/kernel/fs/ftest/ftest07.c b/testcases/kernel/fs/ftest/ftest07.c
index 96f48f9..a6f36ec 100644
--- a/testcases/kernel/fs/ftest/ftest07.c
+++ b/testcases/kernel/fs/ftest/ftest07.c
@@ -108,10 +108,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/fs/ftest/ftest08.c b/testcases/kernel/fs/ftest/ftest08.c
index 2855f46..7970ab9 100644
--- a/testcases/kernel/fs/ftest/ftest08.c
+++ b/testcases/kernel/fs/ftest/ftest08.c
@@ -90,10 +90,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/fs/proc/proc01.c b/testcases/kernel/fs/proc/proc01.c
index e98c636..f513110 100644
--- a/testcases/kernel/fs/proc/proc01.c
+++ b/testcases/kernel/fs/proc/proc01.c
@@ -429,12 +429,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (opt_buffsize) {
size_t bs;
diff --git a/testcases/kernel/fs/stream/stream01.c b/testcases/kernel/fs/stream/stream01.c
index c711a81..af56bca 100644
--- a/testcases/kernel/fs/stream/stream01.c
+++ b/testcases/kernel/fs/stream/stream01.c
@@ -53,13 +53,11 @@
char buf[10];
int i;
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
local_flag = PASSED;
tst_tmpdir();
diff --git a/testcases/kernel/fs/stream/stream02.c b/testcases/kernel/fs/stream/stream02.c
index fb65b59..98473d8 100644
--- a/testcases/kernel/fs/stream/stream02.c
+++ b/testcases/kernel/fs/stream/stream02.c
@@ -52,13 +52,11 @@
FILE *stream;
int fd;
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
local_flag = PASSED;
tst_tmpdir();
diff --git a/testcases/kernel/fs/stream/stream03.c b/testcases/kernel/fs/stream/stream03.c
index 47ba944..31715f7 100644
--- a/testcases/kernel/fs/stream/stream03.c
+++ b/testcases/kernel/fs/stream/stream03.c
@@ -54,14 +54,11 @@
long pos;
off_t opos;
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
local_flag = PASSED;
tst_tmpdir();
diff --git a/testcases/kernel/fs/stream/stream04.c b/testcases/kernel/fs/stream/stream04.c
index 72a54cf..3dc6791 100644
--- a/testcases/kernel/fs/stream/stream04.c
+++ b/testcases/kernel/fs/stream/stream04.c
@@ -59,13 +59,11 @@
int ret;
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
tst_tmpdir();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/fs/stream/stream05.c b/testcases/kernel/fs/stream/stream05.c
index 9be6131..f561744 100644
--- a/testcases/kernel/fs/stream/stream05.c
+++ b/testcases/kernel/fs/stream/stream05.c
@@ -59,13 +59,11 @@
int nr, fd;
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
tst_tmpdir();
local_flag = PASSED;
diff --git a/testcases/kernel/io/aio/aio01/aio01.c b/testcases/kernel/io/aio/aio01/aio01.c
index 41c34fc..18acb06 100644
--- a/testcases/kernel/io/aio/aio01/aio01.c
+++ b/testcases/kernel/io/aio/aio01/aio01.c
@@ -100,7 +100,6 @@
int failflag = 0;
int bflag = 0, nflag = 0, Fflag = 0;
char *optb, *optn, *optF;
- const char *msg;
struct io_event event;
static struct timespec ts;
struct timeval stv, etv;
@@ -112,11 +111,7 @@
{NULL, NULL, NULL}
};
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- tst_exit();
- }
+ tst_parse_opts(argc, argv, options, &help);
bufsize = (bflag ? atoi(optb) : 8192);
nr = (nflag ? atoi(optn) : 10);
diff --git a/testcases/kernel/io/direct_io/dma_thread_diotest.c b/testcases/kernel/io/direct_io/dma_thread_diotest.c
index 25cbcc9..877b707 100644
--- a/testcases/kernel/io/direct_io/dma_thread_diotest.c
+++ b/testcases/kernel/io/direct_io/dma_thread_diotest.c
@@ -228,12 +228,9 @@
int main(int argc, char *argv[])
{
int i, lc;
- const char *msg;
workers = sysconf(_SC_NPROCESSORS_ONLN);
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
setup();
diff --git a/testcases/kernel/ipc/semaphore/sem02.c b/testcases/kernel/ipc/semaphore/sem02.c
index 6377d8b..6d25569 100644
--- a/testcases/kernel/ipc/semaphore/sem02.c
+++ b/testcases/kernel/ipc/semaphore/sem02.c
@@ -79,14 +79,12 @@
int main(int argc, char **argv)
{
int i, rc;
- const char *msg;
union semun semunion;
pthread_t pt[NUMTHREADS];
pthread_attr_t attr;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
/* Create the semaphore set */
sem_id = semget(KEY, 1, 0666 | IPC_CREAT);
if (sem_id < 0) {
diff --git a/testcases/kernel/logging/kmsg/kmsg01.c b/testcases/kernel/logging/kmsg/kmsg01.c
index 3803304..e761fc5 100644
--- a/testcases/kernel/logging/kmsg/kmsg01.c
+++ b/testcases/kernel/logging/kmsg/kmsg01.c
@@ -557,11 +557,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/mem/cpuset/cpuset01.c b/testcases/kernel/mem/cpuset/cpuset01.c
index 0eb4137..b41e0b2 100644
--- a/testcases/kernel/mem/cpuset/cpuset01.c
+++ b/testcases/kernel/mem/cpuset/cpuset01.c
@@ -70,11 +70,8 @@
int main(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
ncpus = count_cpu();
if (get_allowed_nodes_arr(NH_MEMS | NH_CPUS, &nnodes, &nodes) < 0)
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
index 58c5d7c..071d2d8 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
@@ -82,7 +82,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int Hflag = 0;
long page_sz = 0;
int sflag = 0;
@@ -93,10 +92,7 @@
{NULL, NULL, NULL}
};
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s,"
- "use -help", msg);
+ tst_parse_opts(ac, av, options, &help);
if (!Hflag) {
tst_tmpdir();
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
index 1df2c2e..e62f8b2 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
@@ -79,7 +79,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int Hflag = 0;
long page_sz, map_sz;
int sflag = 0;
@@ -90,10 +89,7 @@
{NULL, NULL, NULL}
};
- msg = parse_opts(ac, av, options, &help);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s,"
- " use -help", msg);
+ tst_parse_opts(ac, av, options, &help);
if (!Hflag) {
tst_tmpdir();
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
index d4b801d..14199ee 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
@@ -85,7 +85,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int Hflag = 0;
int sflag = 0;
int huge_pagesize = 0;
@@ -96,10 +95,7 @@
{NULL, NULL, NULL}
};
- msg = parse_opts(ac, av, options, &help);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s,"
- " use -help", msg);
+ tst_parse_opts(ac, av, options, &help);
if (!Hflag) {
tst_tmpdir();
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
index 755530c..97d7689 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c
@@ -112,14 +112,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
init_hugepagesize();
init_sys_sz_paths();
- msg = parse_opts(argc, argv, options, usage);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, usage);
if (opt_sysfs) {
strncpy(path, path_sys_sz_huge, strlen(path_sys_sz_huge) + 1);
strncpy(pathover, path_sys_sz_over,
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
index c306e5c..55db081 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c
@@ -100,11 +100,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
index 6a70be9..d3d4eb1 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c
@@ -90,11 +90,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
index 8456892..237e63e 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c
@@ -80,13 +80,10 @@
int main(int ac, char **av)
{
- const char *msg;
int status;
pid_t pid;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c
index 4ddff56..7f0fbca 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c
@@ -65,11 +65,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
index 18a820e..657f9cb 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c
@@ -111,11 +111,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
index 3c819f4..3eab880 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c
@@ -94,11 +94,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
index dd33be1..ae35eb6 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c
@@ -99,13 +99,11 @@
int main(int ac, char **av)
{
- const char *msg;
pid_t pid;
int status;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
index ddd7dac..b89a447 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c
@@ -84,11 +84,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
index 3b636e8..619a69f 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c
@@ -77,12 +77,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct shmid_ds buf;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
index 30b0140..e6ef517 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
@@ -93,12 +93,10 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
int shm_id_2 = -1;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
index e53666b..efeffda 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
@@ -81,11 +81,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
index 3a9c77f..1190c0d 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
@@ -82,13 +82,11 @@
int main(int ac, char **av)
{
- const char *msg;
pid_t pid;
int status;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
if (sflag)
hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX);
diff --git a/testcases/kernel/mem/ksm/ksm01.c b/testcases/kernel/mem/ksm/ksm01.c
index 974fccf..5adac9e 100644
--- a/testcases/kernel/mem/ksm/ksm01.c
+++ b/testcases/kernel/mem/ksm/ksm01.c
@@ -84,12 +84,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int size = 128, num = 3, unit = 1;
- msg = parse_opts(argc, argv, ksm_options, ksm_usage);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, ksm_options, ksm_usage);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
tst_count = 0;
diff --git a/testcases/kernel/mem/ksm/ksm02.c b/testcases/kernel/mem/ksm/ksm02.c
index 665f1b9..b11eb51 100644
--- a/testcases/kernel/mem/ksm/ksm02.c
+++ b/testcases/kernel/mem/ksm/ksm02.c
@@ -86,14 +86,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int size = 128, num = 3, unit = 1;
unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 };
unsigned int node;
- msg = parse_opts(argc, argv, ksm_options, ksm_usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, ksm_options, ksm_usage);
node = get_a_numa_node(tst_exit);
set_node(nmask, node);
diff --git a/testcases/kernel/mem/ksm/ksm03.c b/testcases/kernel/mem/ksm/ksm03.c
index 41730b0..30abbba 100644
--- a/testcases/kernel/mem/ksm/ksm03.c
+++ b/testcases/kernel/mem/ksm/ksm03.c
@@ -84,12 +84,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int size = 128, num = 3, unit = 1;
- msg = parse_opts(argc, argv, ksm_options, ksm_usage);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, ksm_options, ksm_usage);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
tst_count = 0;
diff --git a/testcases/kernel/mem/ksm/ksm04.c b/testcases/kernel/mem/ksm/ksm04.c
index da66dde..cd1f320 100644
--- a/testcases/kernel/mem/ksm/ksm04.c
+++ b/testcases/kernel/mem/ksm/ksm04.c
@@ -86,14 +86,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int size = 128, num = 3, unit = 1;
unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 };
unsigned int node;
- msg = parse_opts(argc, argv, ksm_options, ksm_usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, ksm_options, ksm_usage);
node = get_a_numa_node(tst_exit);
set_node(nmask, node);
diff --git a/testcases/kernel/mem/ksm/ksm05.c b/testcases/kernel/mem/ksm/ksm05.c
index 07d01c7..1280943 100644
--- a/testcases/kernel/mem/ksm/ksm05.c
+++ b/testcases/kernel/mem/ksm/ksm05.c
@@ -81,13 +81,10 @@
{
int lc, status;
long ps;
- const char *msg;
pid_t pid;
void *ptr;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
ps = sysconf(_SC_PAGESIZE);
setup();
diff --git a/testcases/kernel/mem/ksm/ksm06.c b/testcases/kernel/mem/ksm/ksm06.c
index 8ea8203..1cda01f 100644
--- a/testcases/kernel/mem/ksm/ksm06.c
+++ b/testcases/kernel/mem/ksm/ksm06.c
@@ -70,11 +70,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, options, &usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PASING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &usage);
+
if (n_flag)
nr_pages = SAFE_STRTOUL(NULL, n_opt, 0, ULONG_MAX);
else
diff --git a/testcases/kernel/mem/mem/mem01.c b/testcases/kernel/mem/mem/mem01.c
index 42d94d0..f7642ab 100644
--- a/testcases/kernel/mem/mem/mem01.c
+++ b/testcases/kernel/mem/mem/mem01.c
@@ -152,14 +152,12 @@
int i;
int lc;
- const char *msg;
char *p, *bigmalloc;
int loop_count; /* limited to 16Go on 32 bits systems */
pagesize = sysconf(_SC_PAGESIZE);
- if ((msg = parse_opts(argc, argv, options, help)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (m_opt) {
memsize = (size_t) atoi(m_copt) * 1024 * 1024;
diff --git a/testcases/kernel/mem/oom/oom01.c b/testcases/kernel/mem/oom/oom01.c
index f5214ae..44fa908 100644
--- a/testcases/kernel/mem/oom/oom01.c
+++ b/testcases/kernel/mem/oom/oom01.c
@@ -43,12 +43,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/oom/oom02.c b/testcases/kernel/mem/oom/oom02.c
index 0d4c7c7..fce0110 100644
--- a/testcases/kernel/mem/oom/oom02.c
+++ b/testcases/kernel/mem/oom/oom02.c
@@ -47,12 +47,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c
index 8c11ac2..c5d20b3 100644
--- a/testcases/kernel/mem/oom/oom03.c
+++ b/testcases/kernel/mem/oom/oom03.c
@@ -45,12 +45,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c
index bcd88b5..3defe91 100644
--- a/testcases/kernel/mem/oom/oom04.c
+++ b/testcases/kernel/mem/oom/oom04.c
@@ -47,12 +47,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/oom/oom05.c b/testcases/kernel/mem/oom/oom05.c
index 835c989..38f7e14 100644
--- a/testcases/kernel/mem/oom/oom05.c
+++ b/testcases/kernel/mem/oom/oom05.c
@@ -47,13 +47,10 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
int swap_acc_on = 1;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/swapping/swapping01.c b/testcases/kernel/mem/swapping/swapping01.c
index df11af2..b530ee2 100644
--- a/testcases/kernel/mem/swapping/swapping01.c
+++ b/testcases/kernel/mem/swapping/swapping01.c
@@ -77,11 +77,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/thp/thp01.c b/testcases/kernel/mem/thp/thp01.c
index 459b28c..e1eaa50 100644
--- a/testcases/kernel/mem/thp/thp01.c
+++ b/testcases/kernel/mem/thp/thp01.c
@@ -65,11 +65,8 @@
{
int i, lc, st;
pid_t pid;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/mem/thp/thp02.c b/testcases/kernel/mem/thp/thp02.c
index e8d5d42..1470ae6 100644
--- a/testcases/kernel/mem/thp/thp02.c
+++ b/testcases/kernel/mem/thp/thp02.c
@@ -65,11 +65,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/mem/thp/thp03.c b/testcases/kernel/mem/thp/thp03.c
index 3932df8..8f62d0c 100644
--- a/testcases/kernel/mem/thp/thp03.c
+++ b/testcases/kernel/mem/thp/thp03.c
@@ -63,11 +63,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/mem/thp/thp04.c b/testcases/kernel/mem/thp/thp04.c
index b6e719a..a80d614 100644
--- a/testcases/kernel/mem/thp/thp04.c
+++ b/testcases/kernel/mem/thp/thp04.c
@@ -65,12 +65,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int nr_children = 2, nr_thps = 64;
- msg = parse_opts(argc, argv, thp_options, thp_usage);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, thp_options, thp_usage);
check_thp_options(&nr_children, &nr_thps);
setup();
diff --git a/testcases/kernel/mem/thp/thp05.c b/testcases/kernel/mem/thp/thp05.c
index 690039c..fb0d8d2 100644
--- a/testcases/kernel/mem/thp/thp05.c
+++ b/testcases/kernel/mem/thp/thp05.c
@@ -72,9 +72,8 @@
char *msg;
int nr_children = 2, nr_thps = 64;
- msg = parse_opts(argc, argv, thp_options, thp_usage);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, thp_options, thp_usage);
+
check_thp_options(&nr_children, &nr_thps);
setup();
diff --git a/testcases/kernel/mem/tunable/max_map_count.c b/testcases/kernel/mem/tunable/max_map_count.c
index 6dc54a5..96ec2b8 100644
--- a/testcases/kernel/mem/tunable/max_map_count.c
+++ b/testcases/kernel/mem/tunable/max_map_count.c
@@ -76,12 +76,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR -%s ", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/mem/tunable/min_free_kbytes.c b/testcases/kernel/mem/tunable/min_free_kbytes.c
index 8a3ae7d..7c80380 100644
--- a/testcases/kernel/mem/tunable/min_free_kbytes.c
+++ b/testcases/kernel/mem/tunable/min_free_kbytes.c
@@ -66,10 +66,11 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc, pid, status;
struct sigaction sa;
+ tst_parse_opts(argc, argv, NULL, NULL);
+
sa.sa_handler = sighandler;
if (sigemptyset(&sa.sa_mask) < 0)
tst_brkm(TBROK | TERRNO, cleanup, "sigemptyset");
@@ -77,9 +78,6 @@
if (sigaction(SIGUSR1, &sa, NULL) < 0)
tst_brkm(TBROK | TERRNO, cleanup, "sigaction");
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR -s %s", msg);
setup();
switch (pid = fork()) {
diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c b/testcases/kernel/mem/tunable/overcommit_memory.c
index cbc6710..32e0e64 100644
--- a/testcases/kernel/mem/tunable/overcommit_memory.c
+++ b/testcases/kernel/mem/tunable/overcommit_memory.c
@@ -110,12 +110,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, options, &usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &usage);
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "test is not designed for 32-bit system.");
diff --git a/testcases/kernel/mem/vma/vma01.c b/testcases/kernel/mem/vma/vma01.c
index 79e5f52..f800ffa 100644
--- a/testcases/kernel/mem/vma/vma01.c
+++ b/testcases/kernel/mem/vma/vma01.c
@@ -69,12 +69,9 @@
int main(int argc, char **argv)
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
ps = sysconf(_SC_PAGE_SIZE);
setup();
diff --git a/testcases/kernel/mem/vma/vma02.c b/testcases/kernel/mem/vma/vma02.c
index eb8cc6a..d3c436a 100644
--- a/testcases/kernel/mem/vma/vma02.c
+++ b/testcases/kernel/mem/vma/vma02.c
@@ -68,12 +68,9 @@
int node, err, lc;
char buf[BUFSIZ];
struct bitmask *nmask = numa_allocate_nodemask();
- const char *msg;
pagesize = getpagesize();
- msg = parse_opts(argc, argv, options, usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, usage);
if (opt_node) {
node = SAFE_STRTOL(NULL, opt_nodestr, 1, LONG_MAX);
diff --git a/testcases/kernel/mem/vma/vma03.c b/testcases/kernel/mem/vma/vma03.c
index a2f02d7..ad8a7b4 100644
--- a/testcases/kernel/mem/vma/vma03.c
+++ b/testcases/kernel/mem/vma/vma03.c
@@ -66,7 +66,6 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
void *map, *remap;
off_t pgoff;
@@ -74,9 +73,7 @@
#if __WORDSIZE != 32
tst_brkm(TCONF, NULL, "test is designed for 32-bit system only.");
#endif
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
pgsz = sysconf(_SC_PAGE_SIZE);
setup();
diff --git a/testcases/kernel/mem/vma/vma04.c b/testcases/kernel/mem/vma/vma04.c
index 3ab2681..f4f3809 100644
--- a/testcases/kernel/mem/vma/vma04.c
+++ b/testcases/kernel/mem/vma/vma04.c
@@ -86,11 +86,8 @@
int main(int argc, char **argv)
{
int lc, node, err;
- const char *msg;
- msg = parse_opts(argc, argv, options, usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, usage);
nmask = numa_allocate_nodemask();
if (opt_node) {
diff --git a/testcases/kernel/mem/zram/zram01.c b/testcases/kernel/mem/zram/zram01.c
index 34d8858..a5abb38 100644
--- a/testcases/kernel/mem/zram/zram01.c
+++ b/testcases/kernel/mem/zram/zram01.c
@@ -54,11 +54,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/create_module/create_module01.c b/testcases/kernel/module/create_module/create_module01.c
index d70c155..49822d5 100644
--- a/testcases/kernel/module/create_module/create_module01.c
+++ b/testcases/kernel/module/create_module/create_module01.c
@@ -82,11 +82,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/create_module/create_module02.c b/testcases/kernel/module/create_module/create_module02.c
index a676509..e34a803 100644
--- a/testcases/kernel/module/create_module/create_module02.c
+++ b/testcases/kernel/module/create_module/create_module02.c
@@ -158,11 +158,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/delete_module/delete_module01.c b/testcases/kernel/module/delete_module/delete_module01.c
index 5014bb8..37e6198 100644
--- a/testcases/kernel/module/delete_module/delete_module01.c
+++ b/testcases/kernel/module/delete_module/delete_module01.c
@@ -44,11 +44,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/delete_module/delete_module02.c b/testcases/kernel/module/delete_module/delete_module02.c
index fc9894a..adc77b3 100644
--- a/testcases/kernel/module/delete_module/delete_module02.c
+++ b/testcases/kernel/module/delete_module/delete_module02.c
@@ -82,11 +82,7 @@
int lc;
int i;
- const char *msg;
-
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/delete_module/delete_module03.c b/testcases/kernel/module/delete_module/delete_module03.c
index 1f6edb8..2dc56f8 100644
--- a/testcases/kernel/module/delete_module/delete_module03.c
+++ b/testcases/kernel/module/delete_module/delete_module03.c
@@ -48,11 +48,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/query_module/query_module01.c b/testcases/kernel/module/query_module/query_module01.c
index 753b645..4b9c77c 100644
--- a/testcases/kernel/module/query_module/query_module01.c
+++ b/testcases/kernel/module/query_module/query_module01.c
@@ -154,12 +154,9 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
size_t buflen = sizeof(out_buf);
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
tst_tmpdir();
setup();
diff --git a/testcases/kernel/module/query_module/query_module02.c b/testcases/kernel/module/query_module/query_module02.c
index f2e6994..fcae25d 100644
--- a/testcases/kernel/module/query_module/query_module02.c
+++ b/testcases/kernel/module/query_module/query_module02.c
@@ -140,11 +140,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/module/query_module/query_module03.c b/testcases/kernel/module/query_module/query_module03.c
index 6237884..8dad51a 100644
--- a/testcases/kernel/module/query_module/query_module03.c
+++ b/testcases/kernel/module/query_module/query_module03.c
@@ -151,11 +151,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
tst_tmpdir();
setup();
diff --git a/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c b/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c
index c074e44..15f20a2 100644
--- a/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c
+++ b/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c
@@ -190,10 +190,7 @@
static void setup(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &help);
tst_require_root(NULL);
diff --git a/testcases/kernel/security/smack/smack_set_socket_labels.c b/testcases/kernel/security/smack/smack_set_socket_labels.c
index a4950bb..7102d13 100644
--- a/testcases/kernel/security/smack/smack_set_socket_labels.c
+++ b/testcases/kernel/security/smack/smack_set_socket_labels.c
@@ -42,11 +42,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/abort/abort01.c b/testcases/kernel/syscalls/abort/abort01.c
index da8012c..3a5dff5 100644
--- a/testcases/kernel/syscalls/abort/abort01.c
+++ b/testcases/kernel/syscalls/abort/abort01.c
@@ -53,7 +53,6 @@
register int i;
int status, count, child, kidpid;
int sig, ex;
- const char *msg;
#ifdef WCOREDUMP
int core;
@@ -61,9 +60,7 @@
#endif
ex = sig = 0;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/accept/accept01.c b/testcases/kernel/syscalls/accept/accept01.c
index 1b06e56..e664d61 100644
--- a/testcases/kernel/syscalls/accept/accept01.c
+++ b/testcases/kernel/syscalls/accept/accept01.c
@@ -93,11 +93,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/access/access01.c b/testcases/kernel/syscalls/access/access01.c
index 4a7739f..a31c148 100644
--- a/testcases/kernel/syscalls/access/access01.c
+++ b/testcases/kernel/syscalls/access/access01.c
@@ -62,12 +62,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int tc;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/access/access02.c b/testcases/kernel/syscalls/access/access02.c
index 55f0e38..136ba03 100644
--- a/testcases/kernel/syscalls/access/access02.c
+++ b/testcases/kernel/syscalls/access/access02.c
@@ -79,13 +79,10 @@
{
int lc;
int i;
- const char *msg;
mode_t access_mode;
char *file_name;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/access/access03.c b/testcases/kernel/syscalls/access/access03.c
index fd7c8f8..6f5fa70 100644
--- a/testcases/kernel/syscalls/access/access03.c
+++ b/testcases/kernel/syscalls/access/access03.c
@@ -49,11 +49,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/access/access04.c b/testcases/kernel/syscalls/access/access04.c
index f891209..d7c0844 100644
--- a/testcases/kernel/syscalls/access/access04.c
+++ b/testcases/kernel/syscalls/access/access04.c
@@ -55,11 +55,8 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/access/access05.c b/testcases/kernel/syscalls/access/access05.c
index ce9a9e6..923858c 100644
--- a/testcases/kernel/syscalls/access/access05.c
+++ b/testcases/kernel/syscalls/access/access05.c
@@ -103,12 +103,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/access/access06.c b/testcases/kernel/syscalls/access/access06.c
index 6e94c58..1f811df 100644
--- a/testcases/kernel/syscalls/access/access06.c
+++ b/testcases/kernel/syscalls/access/access06.c
@@ -63,12 +63,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/acct/acct01.c b/testcases/kernel/syscalls/acct/acct01.c
index 05681fa..240096a 100644
--- a/testcases/kernel/syscalls/acct/acct01.c
+++ b/testcases/kernel/syscalls/acct/acct01.c
@@ -86,12 +86,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/add_key/add_key01.c b/testcases/kernel/syscalls/add_key/add_key01.c
index 8aca19c..0e576dc 100644
--- a/testcases/kernel/syscalls/add_key/add_key01.c
+++ b/testcases/kernel/syscalls/add_key/add_key01.c
@@ -52,10 +52,8 @@
int main(int ac, char **av)
{
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/add_key/add_key02.c b/testcases/kernel/syscalls/add_key/add_key02.c
index 038c3ef..14265cc 100644
--- a/testcases/kernel/syscalls/add_key/add_key02.c
+++ b/testcases/kernel/syscalls/add_key/add_key02.c
@@ -66,10 +66,8 @@
{
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex01.c b/testcases/kernel/syscalls/adjtimex/adjtimex01.c
index adefcb6..4cf374f 100644
--- a/testcases/kernel/syscalls/adjtimex/adjtimex01.c
+++ b/testcases/kernel/syscalls/adjtimex/adjtimex01.c
@@ -48,10 +48,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex02.c b/testcases/kernel/syscalls/adjtimex/adjtimex02.c
index be60152..51e51e1 100644
--- a/testcases/kernel/syscalls/adjtimex/adjtimex02.c
+++ b/testcases/kernel/syscalls/adjtimex/adjtimex02.c
@@ -139,10 +139,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/alarm/alarm01.c b/testcases/kernel/syscalls/alarm/alarm01.c
index bba3671..f17207b 100644
--- a/testcases/kernel/syscalls/alarm/alarm01.c
+++ b/testcases/kernel/syscalls/alarm/alarm01.c
@@ -123,10 +123,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/alarm/alarm02.c b/testcases/kernel/syscalls/alarm/alarm02.c
index d416a71..d745e98 100644
--- a/testcases/kernel/syscalls/alarm/alarm02.c
+++ b/testcases/kernel/syscalls/alarm/alarm02.c
@@ -106,7 +106,6 @@
/* Parameters for usc code */
int lc;
- const char *msg;
/* Parameters for alarm test */
char *buf[] = { "-1", "ULONG_MAX", "ULONG_MAX+1" };
@@ -114,8 +113,7 @@
int exp[] = { 0, 0, 0 };
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/alarm/alarm03.c b/testcases/kernel/syscalls/alarm/alarm03.c
index 723d73e..5853a29 100644
--- a/testcases/kernel/syscalls/alarm/alarm03.c
+++ b/testcases/kernel/syscalls/alarm/alarm03.c
@@ -109,11 +109,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int status, retval = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/alarm/alarm05.c b/testcases/kernel/syscalls/alarm/alarm05.c
index bb4e78a..1e93d25 100644
--- a/testcases/kernel/syscalls/alarm/alarm05.c
+++ b/testcases/kernel/syscalls/alarm/alarm05.c
@@ -86,7 +86,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int time_sec1 = 10; /* time for which 1st alarm is set */
int time_sec2 = 5; /* time for which 2st alarm is set */
int ret_val1, ret_val2; /* return values for alarm() calls */
@@ -94,8 +93,7 @@
int sleep_time1 = 3; /* waiting time for the signal */
int sleep_time2 = 6; /* waiting time for the signal */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/alarm/alarm06.c b/testcases/kernel/syscalls/alarm/alarm06.c
index e93e0b2..e31a834 100644
--- a/testcases/kernel/syscalls/alarm/alarm06.c
+++ b/testcases/kernel/syscalls/alarm/alarm06.c
@@ -84,15 +84,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int time_sec1 = 10; /* time for which 1st alarm is set */
int time_sec2 = 0; /* time for which 2nd alarm is set */
int ret_val1, ret_val2; /* return values for alarm() calls */
int sleep_time1 = 5; /* waiting time for the 1st signal */
int sleep_time2 = 10; /* waiting time for the 2nd signal */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/alarm/alarm07.c b/testcases/kernel/syscalls/alarm/alarm07.c
index d692e7e..b270309 100644
--- a/testcases/kernel/syscalls/alarm/alarm07.c
+++ b/testcases/kernel/syscalls/alarm/alarm07.c
@@ -83,14 +83,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int sleep_time = 5;
int status;
int time_sec = 3;
pid_t cpid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/asyncio/asyncio02.c b/testcases/kernel/syscalls/asyncio/asyncio02.c
index e2905f9..e97cc49 100644
--- a/testcases/kernel/syscalls/asyncio/asyncio02.c
+++ b/testcases/kernel/syscalls/asyncio/asyncio02.c
@@ -143,14 +143,12 @@
int ret_val;
int eok; /* everything is ok flag */
int lc;
- const char *msg;
int flag_cnt;
Num_flags = sizeof(Flags) / sizeof(int);
TST_TOTAL = 3 * Num_flags;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/bdflush/bdflush01.c b/testcases/kernel/syscalls/bdflush/bdflush01.c
index de5ca04..df739f1 100644
--- a/testcases/kernel/syscalls/bdflush/bdflush01.c
+++ b/testcases/kernel/syscalls/bdflush/bdflush01.c
@@ -104,10 +104,8 @@
int main(int ac, char **av)
{
long data;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/bind/bind01.c b/testcases/kernel/syscalls/bind/bind01.c
index c96663e..6a3bc50 100644
--- a/testcases/kernel/syscalls/bind/bind01.c
+++ b/testcases/kernel/syscalls/bind/bind01.c
@@ -106,12 +106,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, 0, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/brk/brk01.c b/testcases/kernel/syscalls/brk/brk01.c
index 61ac932..90171cc 100644
--- a/testcases/kernel/syscalls/brk/brk01.c
+++ b/testcases/kernel/syscalls/brk/brk01.c
@@ -62,14 +62,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int incr;
long nbrkpt; /* new brk point value */
long cur_brk_val; /* current size returned by sbrk */
long aft_brk_val; /* current size returned by sbrk */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c
index 457b2fc..f9e0d1e 100644
--- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c
+++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c
@@ -118,11 +118,8 @@
{
char *addr = NULL;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/capget/capget01.c b/testcases/kernel/syscalls/capget/capget01.c
index 5660cba..d030422 100644
--- a/testcases/kernel/syscalls/capget/capget01.c
+++ b/testcases/kernel/syscalls/capget/capget01.c
@@ -85,10 +85,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/capget/capget02.c b/testcases/kernel/syscalls/capget/capget02.c
index e1b7455..7a17279 100644
--- a/testcases/kernel/syscalls/capget/capget02.c
+++ b/testcases/kernel/syscalls/capget/capget02.c
@@ -120,10 +120,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/capset/capset01.c b/testcases/kernel/syscalls/capset/capset01.c
index 6804af1..517fd14 100644
--- a/testcases/kernel/syscalls/capset/capset01.c
+++ b/testcases/kernel/syscalls/capset/capset01.c
@@ -98,10 +98,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/capset/capset02.c b/testcases/kernel/syscalls/capset/capset02.c
index 411d35c..146755c 100644
--- a/testcases/kernel/syscalls/capset/capset02.c
+++ b/testcases/kernel/syscalls/capset/capset02.c
@@ -130,10 +130,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&child_func, "");
#endif
diff --git a/testcases/kernel/syscalls/chdir/chdir01.c b/testcases/kernel/syscalls/chdir/chdir01.c
index f1a3f9d..1933377 100644
--- a/testcases/kernel/syscalls/chdir/chdir01.c
+++ b/testcases/kernel/syscalls/chdir/chdir01.c
@@ -74,10 +74,8 @@
char *filenames[3];
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chdir/chdir02.c b/testcases/kernel/syscalls/chdir/chdir02.c
index 1d5834d..6fc251c 100644
--- a/testcases/kernel/syscalls/chdir/chdir02.c
+++ b/testcases/kernel/syscalls/chdir/chdir02.c
@@ -125,10 +125,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chdir/chdir03.c b/testcases/kernel/syscalls/chdir/chdir03.c
index a373675..cc46781 100644
--- a/testcases/kernel/syscalls/chdir/chdir03.c
+++ b/testcases/kernel/syscalls/chdir/chdir03.c
@@ -74,13 +74,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid, pid1;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chdir/chdir04.c b/testcases/kernel/syscalls/chdir/chdir04.c
index 49efb3d..9e0a9e9 100644
--- a/testcases/kernel/syscalls/chdir/chdir04.c
+++ b/testcases/kernel/syscalls/chdir/chdir04.c
@@ -107,10 +107,8 @@
{
int lc;
int i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod01.c b/testcases/kernel/syscalls/chmod/chmod01.c
index d0d6882..0616705 100644
--- a/testcases/kernel/syscalls/chmod/chmod01.c
+++ b/testcases/kernel/syscalls/chmod/chmod01.c
@@ -92,15 +92,12 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
int i;
int mode;
TST_TOTAL = sizeof(modes) / sizeof(int);
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod02.c b/testcases/kernel/syscalls/chmod/chmod02.c
index d3acd49..ba580cd 100644
--- a/testcases/kernel/syscalls/chmod/chmod02.c
+++ b/testcases/kernel/syscalls/chmod/chmod02.c
@@ -61,10 +61,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod03.c b/testcases/kernel/syscalls/chmod/chmod03.c
index 598d076..6109304 100644
--- a/testcases/kernel/syscalls/chmod/chmod03.c
+++ b/testcases/kernel/syscalls/chmod/chmod03.c
@@ -100,11 +100,9 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
mode_t file_mode;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod04.c b/testcases/kernel/syscalls/chmod/chmod04.c
index 3cd0c71..aa706cd 100644
--- a/testcases/kernel/syscalls/chmod/chmod04.c
+++ b/testcases/kernel/syscalls/chmod/chmod04.c
@@ -100,11 +100,9 @@
{
struct stat stat_buf; /* stat struct. */
int lc;
- const char *msg;
mode_t dir_mode; /* mode permissions set on testdirectory */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod05.c b/testcases/kernel/syscalls/chmod/chmod05.c
index 9ce56bb..b6a70cb 100644
--- a/testcases/kernel/syscalls/chmod/chmod05.c
+++ b/testcases/kernel/syscalls/chmod/chmod05.c
@@ -115,11 +115,9 @@
{
struct stat stat_buf; /* stat struct */
int lc;
- const char *msg;
mode_t dir_mode; /* mode permissions set on test directory */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod06.c b/testcases/kernel/syscalls/chmod/chmod06.c
index 6bf7ca7..b9d9f82 100644
--- a/testcases/kernel/syscalls/chmod/chmod06.c
+++ b/testcases/kernel/syscalls/chmod/chmod06.c
@@ -109,12 +109,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chmod/chmod07.c b/testcases/kernel/syscalls/chmod/chmod07.c
index 44b8e17..a377efb 100644
--- a/testcases/kernel/syscalls/chmod/chmod07.c
+++ b/testcases/kernel/syscalls/chmod/chmod07.c
@@ -101,10 +101,8 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c
index e8a5bab..f90de4b 100644
--- a/testcases/kernel/syscalls/chown/chown01.c
+++ b/testcases/kernel/syscalls/chown/chown01.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chown/chown02.c b/testcases/kernel/syscalls/chown/chown02.c
index e205a21..74d336e 100644
--- a/testcases/kernel/syscalls/chown/chown02.c
+++ b/testcases/kernel/syscalls/chown/chown02.c
@@ -115,15 +115,13 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
int i;
uid_t user_id; /* user id of the user set for testfile */
gid_t group_id; /* group id of the user set for testfile */
int test_flag; /* test condition specific flag variable */
char *file_name; /* ptr. for test file name */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c
index 742d901..cec3274 100644
--- a/testcases/kernel/syscalls/chown/chown03.c
+++ b/testcases/kernel/syscalls/chown/chown03.c
@@ -99,12 +99,10 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
uid_t user_id; /* Owner id of the test file. */
gid_t group_id; /* Group id of the test file. */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chown/chown04.c b/testcases/kernel/syscalls/chown/chown04.c
index 07c4b83..1739583 100644
--- a/testcases/kernel/syscalls/chown/chown04.c
+++ b/testcases/kernel/syscalls/chown/chown04.c
@@ -96,14 +96,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
uid_t user_id;
gid_t group_id;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chown/chown05.c b/testcases/kernel/syscalls/chown/chown05.c
index 423f053..7331b36 100644
--- a/testcases/kernel/syscalls/chown/chown05.c
+++ b/testcases/kernel/syscalls/chown/chown05.c
@@ -103,13 +103,11 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
int i;
uid_t user_id; /* user id of the user set for testfile */
gid_t group_id; /* group id of the user set for testfile */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chroot/chroot01.c b/testcases/kernel/syscalls/chroot/chroot01.c
index 2aa8428..bff9bb8 100644
--- a/testcases/kernel/syscalls/chroot/chroot01.c
+++ b/testcases/kernel/syscalls/chroot/chroot01.c
@@ -64,10 +64,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chroot/chroot02.c b/testcases/kernel/syscalls/chroot/chroot02.c
index 26c01a0..c02b44b 100644
--- a/testcases/kernel/syscalls/chroot/chroot02.c
+++ b/testcases/kernel/syscalls/chroot/chroot02.c
@@ -66,11 +66,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int pid, status, retval;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chroot/chroot03.c b/testcases/kernel/syscalls/chroot/chroot03.c
index fbda38e..9376892 100644
--- a/testcases/kernel/syscalls/chroot/chroot03.c
+++ b/testcases/kernel/syscalls/chroot/chroot03.c
@@ -101,11 +101,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/chroot/chroot04.c b/testcases/kernel/syscalls/chroot/chroot04.c
index 2c56b4d..6d1d46b 100644
--- a/testcases/kernel/syscalls/chroot/chroot04.c
+++ b/testcases/kernel/syscalls/chroot/chroot04.c
@@ -64,10 +64,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clock_getres/clock_getres01.c b/testcases/kernel/syscalls/clock_getres/clock_getres01.c
index 42ff528..a626414 100644
--- a/testcases/kernel/syscalls/clock_getres/clock_getres01.c
+++ b/testcases/kernel/syscalls/clock_getres/clock_getres01.c
@@ -77,10 +77,8 @@
int i;
int lc;
struct timespec res;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)))
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
index 45dee62..312b695 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
@@ -362,10 +362,8 @@
int result = RESULT_OK;
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
index 26fc4de..04fe7a1 100644
--- a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
@@ -114,12 +114,9 @@
{
int i;
int lc;
- const char *msg;
struct timespec ts;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone01.c b/testcases/kernel/syscalls/clone/clone01.c
index fea478d..855c108 100644
--- a/testcases/kernel/syscalls/clone/clone01.c
+++ b/testcases/kernel/syscalls/clone/clone01.c
@@ -41,13 +41,10 @@
int main(int ac, char **av)
{
- const char *msg;
void *child_stack;
int status, child_pid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone02.c b/testcases/kernel/syscalls/clone/clone02.c
index d477c8f..20442b3 100644
--- a/testcases/kernel/syscalls/clone/clone02.c
+++ b/testcases/kernel/syscalls/clone/clone02.c
@@ -114,13 +114,10 @@
{
int lc;
- const char *msg;
void *child_stack;
int status, i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone03.c b/testcases/kernel/syscalls/clone/clone03.c
index 5a310bc..f4216ea 100644
--- a/testcases/kernel/syscalls/clone/clone03.c
+++ b/testcases/kernel/syscalls/clone/clone03.c
@@ -57,14 +57,11 @@
{
int lc;
- const char *msg;
void *child_stack;
char buff[10];
int child_pid, status;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone04.c b/testcases/kernel/syscalls/clone/clone04.c
index 7994d0f..7f862b8 100644
--- a/testcases/kernel/syscalls/clone/clone04.c
+++ b/testcases/kernel/syscalls/clone/clone04.c
@@ -53,12 +53,9 @@
int main(int ac, char **av)
{
int lc, ind;
- const char *msg;
void *test_stack;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone05.c b/testcases/kernel/syscalls/clone/clone05.c
index 33a8c61..a326209 100644
--- a/testcases/kernel/syscalls/clone/clone05.c
+++ b/testcases/kernel/syscalls/clone/clone05.c
@@ -43,12 +43,9 @@
{
int lc, status;
- const char *msg;
void *child_stack;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone06.c b/testcases/kernel/syscalls/clone/clone06.c
index b2846cb..99e7f38 100644
--- a/testcases/kernel/syscalls/clone/clone06.c
+++ b/testcases/kernel/syscalls/clone/clone06.c
@@ -47,14 +47,11 @@
{
int lc, status;
- const char *msg;
void *child_stack;
char *parent_env;
char buff[MAX_LINE_LENGTH];
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone07.c b/testcases/kernel/syscalls/clone/clone07.c
index bd69ee8..8c723de 100644
--- a/testcases/kernel/syscalls/clone/clone07.c
+++ b/testcases/kernel/syscalls/clone/clone07.c
@@ -49,12 +49,9 @@
{
int lc, status;
- const char *msg;
void *child_stack;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/clone/clone08.c b/testcases/kernel/syscalls/clone/clone08.c
index 66fc22f..4c71db4 100644
--- a/testcases/kernel/syscalls/clone/clone08.c
+++ b/testcases/kernel/syscalls/clone/clone08.c
@@ -81,12 +81,9 @@
int main(int ac, char **av)
{
- const char *msg;
int i, lc;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/close/close01.c b/testcases/kernel/syscalls/close/close01.c
index 08a909a..7b119ce 100644
--- a/testcases/kernel/syscalls/close/close01.c
+++ b/testcases/kernel/syscalls/close/close01.c
@@ -55,10 +55,8 @@
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/close/close02.c b/testcases/kernel/syscalls/close/close02.c
index b56569c..ddda5d9 100644
--- a/testcases/kernel/syscalls/close/close02.c
+++ b/testcases/kernel/syscalls/close/close02.c
@@ -67,11 +67,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/close/close08.c b/testcases/kernel/syscalls/close/close08.c
index caa6ad6..f3943db 100644
--- a/testcases/kernel/syscalls/close/close08.c
+++ b/testcases/kernel/syscalls/close/close08.c
@@ -127,11 +127,9 @@
int main(int ac, char **av)
{
- const char *msg;
int lc;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/cma/process_vm01.c b/testcases/kernel/syscalls/cma/process_vm01.c
index 2f34e25..3473de3 100644
--- a/testcases/kernel/syscalls/cma/process_vm01.c
+++ b/testcases/kernel/syscalls/cma/process_vm01.c
@@ -82,11 +82,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &help);
setup(argv);
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/cma/process_vm_readv02.c b/testcases/kernel/syscalls/cma/process_vm_readv02.c
index fa97aa2..426325e 100644
--- a/testcases/kernel/syscalls/cma/process_vm_readv02.c
+++ b/testcases/kernel/syscalls/cma/process_vm_readv02.c
@@ -48,11 +48,8 @@
int main(int argc, char **argv)
{
int lc, status;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/cma/process_vm_readv03.c b/testcases/kernel/syscalls/cma/process_vm_readv03.c
index 025557d..fe9e548 100644
--- a/testcases/kernel/syscalls/cma/process_vm_readv03.c
+++ b/testcases/kernel/syscalls/cma/process_vm_readv03.c
@@ -63,13 +63,9 @@
int main(int argc, char **argv)
{
int lc, status;
- const char *msg;
int *bufsz_arr;
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s"
- "use -help", msg);
+ tst_parse_opts(argc, argv, options, &help);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/cma/process_vm_writev02.c b/testcases/kernel/syscalls/cma/process_vm_writev02.c
index 301293f..9d86c47 100644
--- a/testcases/kernel/syscalls/cma/process_vm_writev02.c
+++ b/testcases/kernel/syscalls/cma/process_vm_writev02.c
@@ -58,11 +58,8 @@
int main(int argc, char **argv)
{
int lc, status;
- const char *msg;
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &help);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/confstr/confstr01.c b/testcases/kernel/syscalls/confstr/confstr01.c
index 749ff6f..0fc4c46 100644
--- a/testcases/kernel/syscalls/confstr/confstr01.c
+++ b/testcases/kernel/syscalls/confstr/confstr01.c
@@ -80,11 +80,8 @@
int i;
char *buf;
int len;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/connect/connect01.c b/testcases/kernel/syscalls/connect/connect01.c
index 86a0e23..af60354 100644
--- a/testcases/kernel/syscalls/connect/connect01.c
+++ b/testcases/kernel/syscalls/connect/connect01.c
@@ -118,12 +118,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
maybe_run_child(&do_child, "d", &sfd);
diff --git a/testcases/kernel/syscalls/creat/creat01.c b/testcases/kernel/syscalls/creat/creat01.c
index fa587ad..1b6f708 100644
--- a/testcases/kernel/syscalls/creat/creat01.c
+++ b/testcases/kernel/syscalls/creat/creat01.c
@@ -88,10 +88,8 @@
{
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat03.c b/testcases/kernel/syscalls/creat/creat03.c
index a02fc6e..74f3364 100644
--- a/testcases/kernel/syscalls/creat/creat03.c
+++ b/testcases/kernel/syscalls/creat/creat03.c
@@ -64,10 +64,8 @@
struct stat statbuf;
unsigned short filmode;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat04.c b/testcases/kernel/syscalls/creat/creat04.c
index 280dcdf..0268e77 100644
--- a/testcases/kernel/syscalls/creat/creat04.c
+++ b/testcases/kernel/syscalls/creat/creat04.c
@@ -85,13 +85,11 @@
{
int lc;
int retval = 0;
- const char *msg;
pid_t pid, pid1;
int i, status, fd;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat05.c b/testcases/kernel/syscalls/creat/creat05.c
index 468f876..c9433ec 100644
--- a/testcases/kernel/syscalls/creat/creat05.c
+++ b/testcases/kernel/syscalls/creat/creat05.c
@@ -70,11 +70,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat06.c b/testcases/kernel/syscalls/creat/creat06.c
index 0989a99..a484420 100644
--- a/testcases/kernel/syscalls/creat/creat06.c
+++ b/testcases/kernel/syscalls/creat/creat06.c
@@ -109,12 +109,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat07.c b/testcases/kernel/syscalls/creat/creat07.c
index bbebf7b..c3cbd37 100644
--- a/testcases/kernel/syscalls/creat/creat07.c
+++ b/testcases/kernel/syscalls/creat/creat07.c
@@ -44,11 +44,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat08.c b/testcases/kernel/syscalls/creat/creat08.c
index 0b3f981..46dcb28 100644
--- a/testcases/kernel/syscalls/creat/creat08.c
+++ b/testcases/kernel/syscalls/creat/creat08.c
@@ -87,13 +87,8 @@
int fd;
int lc;
- const char *msg;
- /*
- * parse standard options
- */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/creat/creat09.c b/testcases/kernel/syscalls/creat/creat09.c
index 30c5952..e52ad34 100644
--- a/testcases/kernel/syscalls/creat/creat09.c
+++ b/testcases/kernel/syscalls/creat/creat09.c
@@ -128,10 +128,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup01.c b/testcases/kernel/syscalls/dup/dup01.c
index 9d0ff58..7c0b77a 100644
--- a/testcases/kernel/syscalls/dup/dup01.c
+++ b/testcases/kernel/syscalls/dup/dup01.c
@@ -128,10 +128,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup02.c b/testcases/kernel/syscalls/dup/dup02.c
index 9f0edcf..6d73698 100644
--- a/testcases/kernel/syscalls/dup/dup02.c
+++ b/testcases/kernel/syscalls/dup/dup02.c
@@ -126,12 +126,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int nfds = sizeof(Fds) / sizeof(int);
int ind;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup03.c b/testcases/kernel/syscalls/dup/dup03.c
index a9b61e3..e677526 100644
--- a/testcases/kernel/syscalls/dup/dup03.c
+++ b/testcases/kernel/syscalls/dup/dup03.c
@@ -126,10 +126,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup04.c b/testcases/kernel/syscalls/dup/dup04.c
index dd60dfd..eaaeb78 100644
--- a/testcases/kernel/syscalls/dup/dup04.c
+++ b/testcases/kernel/syscalls/dup/dup04.c
@@ -131,10 +131,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup05.c b/testcases/kernel/syscalls/dup/dup05.c
index 67a71a1..1e9ac05 100644
--- a/testcases/kernel/syscalls/dup/dup05.c
+++ b/testcases/kernel/syscalls/dup/dup05.c
@@ -129,10 +129,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup06.c b/testcases/kernel/syscalls/dup/dup06.c
index d4082ff..e3f8070 100644
--- a/testcases/kernel/syscalls/dup/dup06.c
+++ b/testcases/kernel/syscalls/dup/dup06.c
@@ -57,11 +57,9 @@
int min;
int freefds;
int lc;
- const char *msg;
const char *pfilname = "dup06";
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup/dup07.c b/testcases/kernel/syscalls/dup/dup07.c
index f89fe73..a100f5d 100644
--- a/testcases/kernel/syscalls/dup/dup07.c
+++ b/testcases/kernel/syscalls/dup/dup07.c
@@ -52,10 +52,8 @@
int duprdo, dupwro, duprdwr;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup2/dup201.c b/testcases/kernel/syscalls/dup2/dup201.c
index 4435b66..7725156 100644
--- a/testcases/kernel/syscalls/dup2/dup201.c
+++ b/testcases/kernel/syscalls/dup2/dup201.c
@@ -102,10 +102,8 @@
{
int lc;
int i, j;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup2/dup202.c b/testcases/kernel/syscalls/dup2/dup202.c
index 5e8d14a..daff81f 100644
--- a/testcases/kernel/syscalls/dup2/dup202.c
+++ b/testcases/kernel/syscalls/dup2/dup202.c
@@ -86,12 +86,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i, ofd;
struct stat oldbuf, newbuf;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup2/dup203.c b/testcases/kernel/syscalls/dup2/dup203.c
index b818030..4fdc9f4 100644
--- a/testcases/kernel/syscalls/dup2/dup203.c
+++ b/testcases/kernel/syscalls/dup2/dup203.c
@@ -63,10 +63,8 @@
char buf[40];
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup2/dup204.c b/testcases/kernel/syscalls/dup2/dup204.c
index 9623472..3e447d4 100644
--- a/testcases/kernel/syscalls/dup2/dup204.c
+++ b/testcases/kernel/syscalls/dup2/dup204.c
@@ -63,12 +63,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
struct stat oldbuf, newbuf;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/dup2/dup205.c b/testcases/kernel/syscalls/dup2/dup205.c
index 6cf30e5..14218dd 100644
--- a/testcases/kernel/syscalls/dup2/dup205.c
+++ b/testcases/kernel/syscalls/dup2/dup205.c
@@ -57,12 +57,10 @@
int serrno;
int lc;
- const char *msg;
ifile = -1;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
local_flag = PASSED;
diff --git a/testcases/kernel/syscalls/dup3/dup3_02.c b/testcases/kernel/syscalls/dup3/dup3_02.c
index bdbaef6..f336904 100644
--- a/testcases/kernel/syscalls/dup3/dup3_02.c
+++ b/testcases/kernel/syscalls/dup3/dup3_02.c
@@ -64,11 +64,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/eventfd/eventfd01.c b/testcases/kernel/syscalls/eventfd/eventfd01.c
index 83377dd..378f61e 100644
--- a/testcases/kernel/syscalls/eventfd/eventfd01.c
+++ b/testcases/kernel/syscalls/eventfd/eventfd01.c
@@ -656,11 +656,9 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int fd;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execl/execl01.c b/testcases/kernel/syscalls/execl/execl01.c
index 0b98663..2f68f48 100644
--- a/testcases/kernel/syscalls/execl/execl01.c
+++ b/testcases/kernel/syscalls/execl/execl01.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execle/execle01.c b/testcases/kernel/syscalls/execle/execle01.c
index 056beb2..3e74290 100644
--- a/testcases/kernel/syscalls/execle/execle01.c
+++ b/testcases/kernel/syscalls/execle/execle01.c
@@ -130,10 +130,8 @@
int main(int ac, char **av, char **environ)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execlp/execlp01.c b/testcases/kernel/syscalls/execlp/execlp01.c
index 5005633..6f5f4f9 100644
--- a/testcases/kernel/syscalls/execlp/execlp01.c
+++ b/testcases/kernel/syscalls/execlp/execlp01.c
@@ -131,10 +131,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execv/execv01.c b/testcases/kernel/syscalls/execv/execv01.c
index 3b566f9..eb7670a 100644
--- a/testcases/kernel/syscalls/execv/execv01.c
+++ b/testcases/kernel/syscalls/execv/execv01.c
@@ -132,10 +132,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execve/execve01.c b/testcases/kernel/syscalls/execve/execve01.c
index 889b4b9..00b8bf8 100644
--- a/testcases/kernel/syscalls/execve/execve01.c
+++ b/testcases/kernel/syscalls/execve/execve01.c
@@ -132,10 +132,8 @@
int main(int ac, char **av, char **environ)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execve/execve02.c b/testcases/kernel/syscalls/execve/execve02.c
index 3a10bca..9c6be6d 100644
--- a/testcases/kernel/syscalls/execve/execve02.c
+++ b/testcases/kernel/syscalls/execve/execve02.c
@@ -76,11 +76,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execve/execve03.c b/testcases/kernel/syscalls/execve/execve03.c
index 0d6cd4c..a3e589e 100644
--- a/testcases/kernel/syscalls/execve/execve03.c
+++ b/testcases/kernel/syscalls/execve/execve03.c
@@ -127,11 +127,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execve/execve04.c b/testcases/kernel/syscalls/execve/execve04.c
index 2793121..7847470 100644
--- a/testcases/kernel/syscalls/execve/execve04.c
+++ b/testcases/kernel/syscalls/execve/execve04.c
@@ -50,13 +50,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
char *argv[2] = {TEST_APP, NULL};
char *env[1] = {NULL};
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/execve/execve05.c b/testcases/kernel/syscalls/execve/execve05.c
index 793cf20..444bead 100644
--- a/testcases/kernel/syscalls/execve/execve05.c
+++ b/testcases/kernel/syscalls/execve/execve05.c
@@ -73,10 +73,8 @@
pid_t pid;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/execvp/execvp01.c b/testcases/kernel/syscalls/execvp/execvp01.c
index aa21bc6..e55e52d 100644
--- a/testcases/kernel/syscalls/execvp/execvp01.c
+++ b/testcases/kernel/syscalls/execvp/execvp01.c
@@ -132,10 +132,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/exit/exit01.c b/testcases/kernel/syscalls/exit/exit01.c
index 9ca82a1..1c15f43 100644
--- a/testcases/kernel/syscalls/exit/exit01.c
+++ b/testcases/kernel/syscalls/exit/exit01.c
@@ -40,11 +40,8 @@
int pid, npid, sig, nsig, exno, nexno, status;
int rval = 0;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, cleanup, "OPTION PARSIkNG ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/exit/exit02.c b/testcases/kernel/syscalls/exit/exit02.c
index 38a9290..7858c89 100644
--- a/testcases/kernel/syscalls/exit/exit02.c
+++ b/testcases/kernel/syscalls/exit/exit02.c
@@ -71,14 +71,11 @@
int len, rlen;
int rval = 0;
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup for test */
diff --git a/testcases/kernel/syscalls/exit_group/exit_group01.c b/testcases/kernel/syscalls/exit_group/exit_group01.c
index 34dafb5..7873316 100644
--- a/testcases/kernel/syscalls/exit_group/exit_group01.c
+++ b/testcases/kernel/syscalls/exit_group/exit_group01.c
@@ -59,11 +59,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_exit_group();
diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c
index 485d96b..7f0e87a 100644
--- a/testcases/kernel/syscalls/faccessat/faccessat01.c
+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
@@ -72,7 +72,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Disable test if the version of the kernel is less than 2.6.16 */
@@ -82,8 +81,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
index 2d71921..fa966e6 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c
@@ -78,7 +78,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Check this system has fadvise64 system which is used
@@ -93,8 +92,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
index 580ae47..73ca311 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c
@@ -78,7 +78,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Check this system has fadvise64 system which is used
@@ -93,8 +92,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
index 1e77740..9d8a08e 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c
@@ -114,7 +114,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int advise;
/* Check this system has fadvise64 system which is used
@@ -129,8 +128,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
index a63c4ea..af33cf2 100644
--- a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
+++ b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c
@@ -77,7 +77,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Check this system has fadvise64 system which is used
@@ -99,8 +98,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c
index 356d657..e72b123 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate01.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
@@ -200,10 +200,8 @@
{
loff_t expected_size;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fallocate/fallocate02.c b/testcases/kernel/syscalls/fallocate/fallocate02.c
index ad43e06..ba37796 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate02.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate02.c
@@ -87,11 +87,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fallocate/fallocate03.c b/testcases/kernel/syscalls/fallocate/fallocate03.c
index a8e6236..ae2476a 100644
--- a/testcases/kernel/syscalls/fallocate/fallocate03.c
+++ b/testcases/kernel/syscalls/fallocate/fallocate03.c
@@ -227,13 +227,11 @@
{
int test_index = 0;
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/* perform global test setup, call setup() function */
setup();
diff --git a/testcases/kernel/syscalls/fanotify/fanotify01.c b/testcases/kernel/syscalls/fanotify/fanotify01.c
index 7c45df0..31ba417 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify01.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify01.c
@@ -66,10 +66,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fanotify/fanotify02.c b/testcases/kernel/syscalls/fanotify/fanotify02.c
index d7d22b2..35e73b1 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify02.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify02.c
@@ -66,10 +66,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c
index 196b97f..59f5c47 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify03.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify03.c
@@ -158,11 +158,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fd_notify_backup = -1;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fanotify/fanotify04.c b/testcases/kernel/syscalls/fanotify/fanotify04.c
index d387413..0c58ed8 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify04.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify04.c
@@ -201,10 +201,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fanotify/fanotify05.c b/testcases/kernel/syscalls/fanotify/fanotify05.c
index 735f03a..0e32a24 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify05.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify05.c
@@ -60,12 +60,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
int len;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c
index 9421d71..d32708c 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify06.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify06.c
@@ -161,10 +161,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchdir/fchdir01.c b/testcases/kernel/syscalls/fchdir/fchdir01.c
index f250dc3..526dfca 100644
--- a/testcases/kernel/syscalls/fchdir/fchdir01.c
+++ b/testcases/kernel/syscalls/fchdir/fchdir01.c
@@ -78,12 +78,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void check_functionality(void);
int r_val;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/fchdir/fchdir02.c b/testcases/kernel/syscalls/fchdir/fchdir02.c
index 24882d1..cf11bf6 100644
--- a/testcases/kernel/syscalls/fchdir/fchdir02.c
+++ b/testcases/kernel/syscalls/fchdir/fchdir02.c
@@ -69,10 +69,8 @@
{
const int bad_fd = -5;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/fchdir/fchdir03.c b/testcases/kernel/syscalls/fchdir/fchdir03.c
index 5399cf5..647b68c 100644
--- a/testcases/kernel/syscalls/fchdir/fchdir03.c
+++ b/testcases/kernel/syscalls/fchdir/fchdir03.c
@@ -77,13 +77,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod01.c b/testcases/kernel/syscalls/fchmod/fchmod01.c
index 3eedb06..ed6bc44 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod01.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod01.c
@@ -126,10 +126,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod02.c b/testcases/kernel/syscalls/fchmod/fchmod02.c
index 53535b2..c15fd58 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod02.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod02.c
@@ -102,13 +102,8 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod03.c b/testcases/kernel/syscalls/fchmod/fchmod03.c
index 2b93a44..749d70a 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod03.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod03.c
@@ -99,11 +99,9 @@
{
struct stat stat_buf; /* stat struct. */
int lc;
- const char *msg;
mode_t file_mode; /* mode permissions set on testfile */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod04.c b/testcases/kernel/syscalls/fchmod/fchmod04.c
index bfd9cb4..d15ee7e 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod04.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod04.c
@@ -102,11 +102,9 @@
{
struct stat stat_buf; /* stat struct. */
int lc;
- const char *msg;
mode_t dir_mode; /* mode permissions set on testdirectory */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod05.c b/testcases/kernel/syscalls/fchmod/fchmod05.c
index 9fad79c..a1c09a4 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod05.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod05.c
@@ -103,14 +103,9 @@
{
struct stat stat_buf; /* stat struct */
int lc;
- const char *msg;
mode_t dir_mode; /* mode permissions set on test directory */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod06.c b/testcases/kernel/syscalls/fchmod/fchmod06.c
index d08cefe..10cdc8b 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod06.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod06.c
@@ -69,12 +69,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmod/fchmod07.c b/testcases/kernel/syscalls/fchmod/fchmod07.c
index bf0bc26..8ae3b28 100644
--- a/testcases/kernel/syscalls/fchmod/fchmod07.c
+++ b/testcases/kernel/syscalls/fchmod/fchmod07.c
@@ -91,17 +91,12 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
int ind; /* counter variable for chmod(2) tests */
int mode; /* file mode permission */
TST_TOTAL = sizeof(Modes) / sizeof(int);
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
index cbbb2ce..19e9ad5 100644
--- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
@@ -72,7 +72,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Disable test if the version of the kernel is less than 2.6.16 */
@@ -82,8 +81,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchown/fchown01.c b/testcases/kernel/syscalls/fchown/fchown01.c
index db0724e..23cc787 100644
--- a/testcases/kernel/syscalls/fchown/fchown01.c
+++ b/testcases/kernel/syscalls/fchown/fchown01.c
@@ -54,10 +54,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchown/fchown02.c b/testcases/kernel/syscalls/fchown/fchown02.c
index 510be37..80688e6 100644
--- a/testcases/kernel/syscalls/fchown/fchown02.c
+++ b/testcases/kernel/syscalls/fchown/fchown02.c
@@ -116,11 +116,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchown/fchown03.c b/testcases/kernel/syscalls/fchown/fchown03.c
index 6498ad1..0005443 100644
--- a/testcases/kernel/syscalls/fchown/fchown03.c
+++ b/testcases/kernel/syscalls/fchown/fchown03.c
@@ -61,13 +61,10 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
uid_t user_id;
gid_t group_id;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchown/fchown04.c b/testcases/kernel/syscalls/fchown/fchown04.c
index 4da7771..0af3afa 100644
--- a/testcases/kernel/syscalls/fchown/fchown04.c
+++ b/testcases/kernel/syscalls/fchown/fchown04.c
@@ -74,12 +74,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchown/fchown05.c b/testcases/kernel/syscalls/fchown/fchown05.c
index f2107be..a490301 100644
--- a/testcases/kernel/syscalls/fchown/fchown05.c
+++ b/testcases/kernel/syscalls/fchown/fchown05.c
@@ -63,13 +63,10 @@
{
struct stat stat_buf;
int i, lc;
- const char *msg;
uid_t user_id;
gid_t group_id;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
index 3d76e38..b361253 100644
--- a/testcases/kernel/syscalls/fchownat/fchownat01.c
+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
@@ -70,11 +70,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c b/testcases/kernel/syscalls/fchownat/fchownat02.c
index dcd66e9..30be9e0 100644
--- a/testcases/kernel/syscalls/fchownat/fchownat02.c
+++ b/testcases/kernel/syscalls/fchownat/fchownat02.c
@@ -53,12 +53,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl01.c b/testcases/kernel/syscalls/fcntl/fcntl01.c
index 0f2f7c5..8d20be2 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl01.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl01.c
@@ -48,10 +48,8 @@
int fd[10], fd2[10];
int mypid, i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl02.c b/testcases/kernel/syscalls/fcntl/fcntl02.c
index 75cb566..afec24a 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl02.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl02.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl03.c b/testcases/kernel/syscalls/fcntl/fcntl03.c
index 9b4f770..2e9fd51 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl03.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl03.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl04.c b/testcases/kernel/syscalls/fcntl/fcntl04.c
index af5d9d6..ed2c016 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl04.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl04.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl05.c b/testcases/kernel/syscalls/fcntl/fcntl05.c
index 975b751..fb4a0f9 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl05.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl05.c
@@ -131,10 +131,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl06.c b/testcases/kernel/syscalls/fcntl/fcntl06.c
index 2313879..8dcc048 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl06.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl06.c
@@ -73,10 +73,7 @@
{
int fail = 0;
- const char *msg;
-
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/fcntl/fcntl07.c b/testcases/kernel/syscalls/fcntl/fcntl07.c
index a031e16..9108b79 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl07.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl07.c
@@ -140,10 +140,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, options, &help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (t_opt)
exit(test_open(t_opt));
diff --git a/testcases/kernel/syscalls/fcntl/fcntl08.c b/testcases/kernel/syscalls/fcntl/fcntl08.c
index 39f9471..5241adf 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl08.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl08.c
@@ -55,10 +55,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl09.c b/testcases/kernel/syscalls/fcntl/fcntl09.c
index 7162bca..179a61d 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl09.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl09.c
@@ -131,13 +131,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl10.c b/testcases/kernel/syscalls/fcntl/fcntl10.c
index c0504da..78c41ad 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl10.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl10.c
@@ -131,13 +131,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c b/testcases/kernel/syscalls/fcntl/fcntl11.c
index 006a6c4..fa6ce53 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl11.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
@@ -243,10 +243,8 @@
struct flock tl;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "ddddd", &parent_pipe[0],
&parent_pipe[1], &child_pipe[0], &child_pipe[1], &fd);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl12.c b/testcases/kernel/syscalls/fcntl/fcntl12.c
index 2889fbe..a176d59 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl12.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl12.c
@@ -56,14 +56,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int fd, i, status, max_files;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl13.c b/testcases/kernel/syscalls/fcntl/fcntl13.c
index 2b48275..d1fe12c 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl13.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl13.c
@@ -50,13 +50,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct flock flock;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl14.c b/testcases/kernel/syscalls/fcntl/fcntl14.c
index 90b34ea..3b36572 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl14.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl14.c
@@ -976,11 +976,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/fcntl/fcntl15.c b/testcases/kernel/syscalls/fcntl/fcntl15.c
index 8e1ddc5..0877576 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl15.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl15.c
@@ -537,13 +537,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fail = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&dochild1_uc, "nddds", 1, &uc_file_flag,
&uc_file_mode, &parent, tmpname);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl16.c b/testcases/kernel/syscalls/fcntl/fcntl16.c
index 5c87680..68c07f0 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl16.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl16.c
@@ -655,11 +655,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(dochild_uc, "ddddd", &kid_uc, &parent, &test,
&thislock, &fd);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c
index 73b781d..5b03e39 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl17.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
@@ -421,12 +421,9 @@
{
int ans;
int lc;
- const char *msg;
int fail = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child1, "nddddddddd", 1, &file_fd,
&parent_pipe[0], &parent_pipe[1],
diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c
index 36e12c4..6b9a7aa 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl18.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl18.c
@@ -65,11 +65,7 @@
struct flock fl;
int pid, status;
- const char *msg;
-
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c b/testcases/kernel/syscalls/fcntl/fcntl19.c
index c98756c..a542cfc 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl19.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
@@ -282,11 +282,8 @@
struct flock tl;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1],
&child_pipe[0], &child_pipe[1], &fd);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c b/testcases/kernel/syscalls/fcntl/fcntl20.c
index f425a8a..aa06bab 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl20.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
@@ -281,11 +281,8 @@
struct flock tl;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1],
&child_pipe[0], &child_pipe[1], &fd);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c b/testcases/kernel/syscalls/fcntl/fcntl21.c
index 1cc0ef0..5307021 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl21.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
@@ -289,11 +289,8 @@
struct flock tl;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1],
&child_pipe[0], &child_pipe[1], &fd);
diff --git a/testcases/kernel/syscalls/fcntl/fcntl22.c b/testcases/kernel/syscalls/fcntl/fcntl22.c
index 7699e29..7bde4dc 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl22.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl22.c
@@ -90,12 +90,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *test_desc; /* test specific error message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/* setup */
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl23.c b/testcases/kernel/syscalls/fcntl/fcntl23.c
index 50314fe..a80f35a 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl23.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl23.c
@@ -107,13 +107,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl24.c b/testcases/kernel/syscalls/fcntl/fcntl24.c
index d3f672f..2c79828 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl24.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl24.c
@@ -108,13 +108,11 @@
{
int lc;
long type;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl25.c b/testcases/kernel/syscalls/fcntl/fcntl25.c
index 83ff36c..f94347c 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl25.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl25.c
@@ -109,13 +109,11 @@
{
int lc;
long type;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl26.c b/testcases/kernel/syscalls/fcntl/fcntl26.c
index f0192ca..eca788d 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl26.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl26.c
@@ -109,13 +109,11 @@
{
int lc;
long type;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl27.c b/testcases/kernel/syscalls/fcntl/fcntl27.c
index 5032bc2..eeb5d63 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl27.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl27.c
@@ -106,14 +106,11 @@
int main(int ac, char **av)
{
- int lc, expected_result = -1; /* loop counter, expected */
- /* result from system call */
- const char *msg;
+ int lc, expected_result = -1;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl28.c b/testcases/kernel/syscalls/fcntl/fcntl28.c
index f239d55..4da04c4 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl28.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl28.c
@@ -103,14 +103,11 @@
int main(int ac, char **av)
{
- int lc, expected_result = -1; /* loop counter, expected resul */
- /* from system call */
- const char *msg;
+ int lc, expected_result = -1;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/fcntl/fcntl29.c b/testcases/kernel/syscalls/fcntl/fcntl29.c
index e9f3e64..653ac22 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl29.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl29.c
@@ -46,11 +46,8 @@
int main(int ac, char **av)
{
int lc, dup_fd;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl30.c b/testcases/kernel/syscalls/fcntl/fcntl30.c
index 5905c64..4a409b8 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl30.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl30.c
@@ -44,14 +44,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int pipe_fds[2], test_fd;
int orig_pipe_size, new_pipe_size;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fcntl/fcntl31.c b/testcases/kernel/syscalls/fcntl/fcntl31.c
index 60ab545..804d0ab 100644
--- a/testcases/kernel/syscalls/fcntl/fcntl31.c
+++ b/testcases/kernel/syscalls/fcntl/fcntl31.c
@@ -84,11 +84,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync01.c b/testcases/kernel/syscalls/fdatasync/fdatasync01.c
index 4caa694..24a9178 100644
--- a/testcases/kernel/syscalls/fdatasync/fdatasync01.c
+++ b/testcases/kernel/syscalls/fdatasync/fdatasync01.c
@@ -82,11 +82,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync02.c b/testcases/kernel/syscalls/fdatasync/fdatasync02.c
index 6e44e2c..5f0d492 100644
--- a/testcases/kernel/syscalls/fdatasync/fdatasync02.c
+++ b/testcases/kernel/syscalls/fdatasync/fdatasync02.c
@@ -108,11 +108,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c
index 3af85db..c010608 100644
--- a/testcases/kernel/syscalls/flock/flock01.c
+++ b/testcases/kernel/syscalls/flock/flock01.c
@@ -91,12 +91,8 @@
int main(int argc, char **argv)
{
int lc, i;
- /* loop counter */
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
/* global setup */
setup();
diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c
index b513ccd..971160d 100644
--- a/testcases/kernel/syscalls/flock/flock02.c
+++ b/testcases/kernel/syscalls/flock/flock02.c
@@ -90,10 +90,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/flock/flock03.c b/testcases/kernel/syscalls/flock/flock03.c
index f264b44..1e519b7 100644
--- a/testcases/kernel/syscalls/flock/flock03.c
+++ b/testcases/kernel/syscalls/flock/flock03.c
@@ -59,13 +59,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
pid_t pid;
int status;
int fd;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&childfunc_uc, "ds", &fd_uc, FILE_NAME);
diff --git a/testcases/kernel/syscalls/flock/flock04.c b/testcases/kernel/syscalls/flock/flock04.c
index 85d89af..5dafaa4 100644
--- a/testcases/kernel/syscalls/flock/flock04.c
+++ b/testcases/kernel/syscalls/flock/flock04.c
@@ -88,11 +88,9 @@
int main(int argc, char **argv)
{
int lc, retval;
- const char *msg;
pid_t pid;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/flock/flock05.c b/testcases/kernel/syscalls/flock/flock05.c
index 2512e27..d9d3d00 100644
--- a/testcases/kernel/syscalls/flock/flock05.c
+++ b/testcases/kernel/syscalls/flock/flock05.c
@@ -88,13 +88,9 @@
int main(int argc, char **argv)
{
int lc, retval;
- /* loop counter */
- const char *msg;
pid_t pid;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
/* global setup */
setup();
diff --git a/testcases/kernel/syscalls/flock/flock06.c b/testcases/kernel/syscalls/flock/flock06.c
index bdbb6d7..1f1e9c3 100644
--- a/testcases/kernel/syscalls/flock/flock06.c
+++ b/testcases/kernel/syscalls/flock/flock06.c
@@ -78,11 +78,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork01.c b/testcases/kernel/syscalls/fork/fork01.c
index ab30268..00d7c45 100644
--- a/testcases/kernel/syscalls/fork/fork01.c
+++ b/testcases/kernel/syscalls/fork/fork01.c
@@ -163,13 +163,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fails;
int kid_status, wait_status;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork02.c b/testcases/kernel/syscalls/fork/fork02.c
index 7222649..6fe66f8 100644
--- a/testcases/kernel/syscalls/fork/fork02.c
+++ b/testcases/kernel/syscalls/fork/fork02.c
@@ -57,11 +57,8 @@
int pid1, pid2, status;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork03.c b/testcases/kernel/syscalls/fork/fork03.c
index f8f64bb..25b36c8 100644
--- a/testcases/kernel/syscalls/fork/fork03.c
+++ b/testcases/kernel/syscalls/fork/fork03.c
@@ -57,11 +57,8 @@
int pid1, pid2, status;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork04.c b/testcases/kernel/syscalls/fork/fork04.c
index 00b360f..d6b57d9 100644
--- a/testcases/kernel/syscalls/fork/fork04.c
+++ b/testcases/kernel/syscalls/fork/fork04.c
@@ -274,15 +274,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int kid_status;
int wait_status;
int fails;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork06.c b/testcases/kernel/syscalls/fork/fork06.c
index 5690fe2..3bc11b1 100644
--- a/testcases/kernel/syscalls/fork/fork06.c
+++ b/testcases/kernel/syscalls/fork/fork06.c
@@ -55,11 +55,8 @@
int i, pid, status, childpid, succeed, fail;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork07.c b/testcases/kernel/syscalls/fork/fork07.c
index de251c8..4344fdf 100644
--- a/testcases/kernel/syscalls/fork/fork07.c
+++ b/testcases/kernel/syscalls/fork/fork07.c
@@ -76,14 +76,11 @@
int c_pass, c_fail;
int lc;
- const char *msg;
rea = NULL;
writ = NULL;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (Nflag) {
if (sscanf(Nforkarg, "%i", &Nforks) != 1)
diff --git a/testcases/kernel/syscalls/fork/fork08.c b/testcases/kernel/syscalls/fork/fork08.c
index 89984ac..09c6167 100644
--- a/testcases/kernel/syscalls/fork/fork08.c
+++ b/testcases/kernel/syscalls/fork/fork08.c
@@ -60,11 +60,8 @@
FILE *rea, *writ;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork09.c b/testcases/kernel/syscalls/fork/fork09.c
index 835caad..35ba015 100644
--- a/testcases/kernel/syscalls/fork/fork09.c
+++ b/testcases/kernel/syscalls/fork/fork09.c
@@ -66,11 +66,8 @@
int pid, status, nf;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork10.c b/testcases/kernel/syscalls/fork/fork10.c
index a215c00..381ce67 100644
--- a/testcases/kernel/syscalls/fork/fork10.c
+++ b/testcases/kernel/syscalls/fork/fork10.c
@@ -62,13 +62,10 @@
char chilchar[2];
int lc;
- const char *msg;
fildes = -1;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork11.c b/testcases/kernel/syscalls/fork/fork11.c
index 5d93838..6afda3a 100644
--- a/testcases/kernel/syscalls/fork/fork11.c
+++ b/testcases/kernel/syscalls/fork/fork11.c
@@ -54,11 +54,8 @@
int i, pid, cpid, status;
int fail = 0;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork12.c b/testcases/kernel/syscalls/fork/fork12.c
index 5732171..711fe98 100644
--- a/testcases/kernel/syscalls/fork/fork12.c
+++ b/testcases/kernel/syscalls/fork/fork12.c
@@ -57,11 +57,8 @@
int forks, pid1, fork_errno, waitstatus;
int ret, status;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fork/fork13.c b/testcases/kernel/syscalls/fork/fork13.c
index 4a41765..d94e86b 100644
--- a/testcases/kernel/syscalls/fork/fork13.c
+++ b/testcases/kernel/syscalls/fork/fork13.c
@@ -72,12 +72,7 @@
int main(int argc, char *argv[])
{
- /* message returned from parse_opts */
- const char *msg;
-
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
check();
cleanup();
diff --git a/testcases/kernel/syscalls/fork/fork14.c b/testcases/kernel/syscalls/fork/fork14.c
index dd8f96a..bbc1d3d 100644
--- a/testcases/kernel/syscalls/fork/fork14.c
+++ b/testcases/kernel/syscalls/fork/fork14.c
@@ -54,11 +54,8 @@
int main(int ac, char **av)
{
int lc, reproduced;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Tested on ppc64/x86_64/i386/s390x. And only 64bit has this issue.
* Since a 32bit program can't mmap so many memory.
diff --git a/testcases/kernel/syscalls/fpathconf/fpathconf01.c b/testcases/kernel/syscalls/fpathconf/fpathconf01.c
index 8056cd7..d38db40 100644
--- a/testcases/kernel/syscalls/fpathconf/fpathconf01.c
+++ b/testcases/kernel/syscalls/fpathconf/fpathconf01.c
@@ -71,11 +71,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fstat/fstat01.c b/testcases/kernel/syscalls/fstat/fstat01.c
index 53037b9..7693755 100644
--- a/testcases/kernel/syscalls/fstat/fstat01.c
+++ b/testcases/kernel/syscalls/fstat/fstat01.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fstat/fstat02.c b/testcases/kernel/syscalls/fstat/fstat02.c
index 1f0964a..0f4d746 100644
--- a/testcases/kernel/syscalls/fstat/fstat02.c
+++ b/testcases/kernel/syscalls/fstat/fstat02.c
@@ -98,10 +98,8 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fstat/fstat03.c b/testcases/kernel/syscalls/fstat/fstat03.c
index 91ddfff..45e27b4 100644
--- a/testcases/kernel/syscalls/fstat/fstat03.c
+++ b/testcases/kernel/syscalls/fstat/fstat03.c
@@ -73,13 +73,8 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Invoke setup function to create a testfile under temporary
diff --git a/testcases/kernel/syscalls/fstat/fstat04.c b/testcases/kernel/syscalls/fstat/fstat04.c
index e9510c1..347fdb5 100644
--- a/testcases/kernel/syscalls/fstat/fstat04.c
+++ b/testcases/kernel/syscalls/fstat/fstat04.c
@@ -97,10 +97,8 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fstat/fstat05.c b/testcases/kernel/syscalls/fstat/fstat05.c
index 35c03d6..7809a45 100644
--- a/testcases/kernel/syscalls/fstat/fstat05.c
+++ b/testcases/kernel/syscalls/fstat/fstat05.c
@@ -131,10 +131,8 @@
struct stat stat_buf; /* stat structure buffer */
struct stat *ptr_str;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/* Buffer points outside user's accessible address space. */
ptr_str = &stat_buf; /* if it was for conformance testing */
diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c b/testcases/kernel/syscalls/fstatat/fstatat01.c
index 33a6b95..61531c6 100644
--- a/testcases/kernel/syscalls/fstatat/fstatat01.c
+++ b/testcases/kernel/syscalls/fstatat/fstatat01.c
@@ -110,7 +110,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
if ((tst_kvercmp(2, 6, 16)) < 0)
@@ -118,8 +117,7 @@
"This test can only run on kernels that are 2.6.16 and "
"higher");
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs01.c b/testcases/kernel/syscalls/fstatfs/fstatfs01.c
index 99f55d5..9600416 100644
--- a/testcases/kernel/syscalls/fstatfs/fstatfs01.c
+++ b/testcases/kernel/syscalls/fstatfs/fstatfs01.c
@@ -69,11 +69,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
struct statfs stats;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs02.c b/testcases/kernel/syscalls/fstatfs/fstatfs02.c
index c51b9a8..db2230f 100644
--- a/testcases/kernel/syscalls/fstatfs/fstatfs02.c
+++ b/testcases/kernel/syscalls/fstatfs/fstatfs02.c
@@ -57,11 +57,8 @@
{
int lc;
int i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fsync/fsync01.c b/testcases/kernel/syscalls/fsync/fsync01.c
index 7c6cecc..340a8d2 100644
--- a/testcases/kernel/syscalls/fsync/fsync01.c
+++ b/testcases/kernel/syscalls/fsync/fsync01.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fsync/fsync02.c b/testcases/kernel/syscalls/fsync/fsync02.c
index aad5f7f..2673edc 100644
--- a/testcases/kernel/syscalls/fsync/fsync02.c
+++ b/testcases/kernel/syscalls/fsync/fsync02.c
@@ -74,7 +74,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
off_t offsetret, offset;
char pbuf[BUFSIZ];
@@ -85,8 +84,7 @@
int data_blocks = 0;
long int random_number;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/fsync/fsync03.c b/testcases/kernel/syscalls/fsync/fsync03.c
index b894412..87c4e5a 100644
--- a/testcases/kernel/syscalls/fsync/fsync03.c
+++ b/testcases/kernel/syscalls/fsync/fsync03.c
@@ -74,11 +74,8 @@
{
int lc;
int i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate01.c b/testcases/kernel/syscalls/ftruncate/ftruncate01.c
index 4c2fe52..ee03529 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate01.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate01.c
@@ -93,14 +93,9 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
off_t file_length; /* test file length */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate02.c b/testcases/kernel/syscalls/ftruncate/ftruncate02.c
index 920039b..40e4ac6 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate02.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate02.c
@@ -95,18 +95,13 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
off_t file_length2; /* test file length */
off_t file_length1; /* test file length */
int rbytes, i; /* bytes read from testfile */
int read_len = 0; /* total no. of bytes read from testfile */
int err_flag = 0; /* error indicator flag */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate04.c b/testcases/kernel/syscalls/ftruncate/ftruncate04.c
index 4f2b24a..99aebfe 100644
--- a/testcases/kernel/syscalls/ftruncate/ftruncate04.c
+++ b/testcases/kernel/syscalls/ftruncate/ftruncate04.c
@@ -72,10 +72,8 @@
int main(int ac, char **av)
{
int lc, pid;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/futex/futex_wait01.c b/testcases/kernel/syscalls/futex/futex_wait01.c
index f57fae3..51a540d 100644
--- a/testcases/kernel/syscalls/futex/futex_wait01.c
+++ b/testcases/kernel/syscalls/futex/futex_wait01.c
@@ -75,10 +75,8 @@
int main(int argc, char *argv[])
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
for (i = 0; i < TST_TOTAL; i++)
diff --git a/testcases/kernel/syscalls/futex/futex_wait02.c b/testcases/kernel/syscalls/futex/futex_wait02.c
index a78a0dc..2b863fe 100644
--- a/testcases/kernel/syscalls/futex/futex_wait02.c
+++ b/testcases/kernel/syscalls/futex/futex_wait02.c
@@ -84,10 +84,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/futex/futex_wait03.c b/testcases/kernel/syscalls/futex/futex_wait03.c
index d09ba70..9683e76 100644
--- a/testcases/kernel/syscalls/futex/futex_wait03.c
+++ b/testcases/kernel/syscalls/futex/futex_wait03.c
@@ -77,10 +77,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_futex_wait();
diff --git a/testcases/kernel/syscalls/futex/futex_wait04.c b/testcases/kernel/syscalls/futex/futex_wait04.c
index 5d8f809..b8360ff 100644
--- a/testcases/kernel/syscalls/futex/futex_wait04.c
+++ b/testcases/kernel/syscalls/futex/futex_wait04.c
@@ -55,10 +55,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_futex_wait();
diff --git a/testcases/kernel/syscalls/futex/futex_wait05.c b/testcases/kernel/syscalls/futex/futex_wait05.c
index d03aac1..eced6e3 100644
--- a/testcases/kernel/syscalls/futex/futex_wait05.c
+++ b/testcases/kernel/syscalls/futex/futex_wait05.c
@@ -74,12 +74,10 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
tst_timer_check(CLOCK_MONOTONIC);
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_futex_wait(CLOCK_MONOTONIC, 0);
diff --git a/testcases/kernel/syscalls/futex/futex_wait_bitset01.c b/testcases/kernel/syscalls/futex/futex_wait_bitset01.c
index 6e25ff4..458db39 100644
--- a/testcases/kernel/syscalls/futex/futex_wait_bitset01.c
+++ b/testcases/kernel/syscalls/futex/futex_wait_bitset01.c
@@ -36,12 +36,10 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
tst_timer_check(CLOCK_MONOTONIC);
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_futex_wait_bitset(DEFAULT_TIMEOUT_MS, CLOCK_MONOTONIC);
diff --git a/testcases/kernel/syscalls/futex/futex_wait_bitset02.c b/testcases/kernel/syscalls/futex/futex_wait_bitset02.c
index ccffe9c..ee6ba43 100644
--- a/testcases/kernel/syscalls/futex/futex_wait_bitset02.c
+++ b/testcases/kernel/syscalls/futex/futex_wait_bitset02.c
@@ -36,12 +36,10 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
tst_timer_check(CLOCK_REALTIME);
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_futex_wait_bitset(DEFAULT_TIMEOUT_MS, CLOCK_REALTIME);
diff --git a/testcases/kernel/syscalls/futex/futex_wake01.c b/testcases/kernel/syscalls/futex/futex_wake01.c
index 679d93b..b5f1904 100644
--- a/testcases/kernel/syscalls/futex/futex_wake01.c
+++ b/testcases/kernel/syscalls/futex/futex_wake01.c
@@ -64,10 +64,8 @@
int main(int argc, char *argv[])
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
for (i = 0; i < TST_TOTAL; i++)
diff --git a/testcases/kernel/syscalls/futex/futex_wake02.c b/testcases/kernel/syscalls/futex/futex_wake02.c
index 4ec858e..02ee534 100644
--- a/testcases/kernel/syscalls/futex/futex_wake02.c
+++ b/testcases/kernel/syscalls/futex/futex_wake02.c
@@ -195,10 +195,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
verify_futex_wake();
diff --git a/testcases/kernel/syscalls/futex/futex_wake03.c b/testcases/kernel/syscalls/futex/futex_wake03.c
index 2f2a857..523f328 100644
--- a/testcases/kernel/syscalls/futex/futex_wake03.c
+++ b/testcases/kernel/syscalls/futex/futex_wake03.c
@@ -106,10 +106,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c
index 0549e12..ae8d4fe 100644
--- a/testcases/kernel/syscalls/futimesat/futimesat01.c
+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
@@ -74,7 +74,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Disable test if the version of the kernel is less than 2.6.16 */
@@ -84,8 +83,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
index ab7972b..5957109 100644
--- a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
+++ b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c
@@ -73,12 +73,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
struct robust_list_head head;
size_t len_ptr; /* size of structure struct robust_list_head */
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getcontext/getcontext01.c b/testcases/kernel/syscalls/getcontext/getcontext01.c
index 5e787b2..48e7890 100644
--- a/testcases/kernel/syscalls/getcontext/getcontext01.c
+++ b/testcases/kernel/syscalls/getcontext/getcontext01.c
@@ -54,10 +54,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c
index 599d9b1..c927512 100644
--- a/testcases/kernel/syscalls/getcpu/getcpu01.c
+++ b/testcases/kernel/syscalls/getcpu/getcpu01.c
@@ -93,7 +93,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
unsigned int cpu_id, node_id = 0;
unsigned int cpu_set;
#ifdef __i386__
@@ -110,8 +109,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/getcwd/getcwd01.c b/testcases/kernel/syscalls/getcwd/getcwd01.c
index a3cdc9a..0d0ecdb 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd01.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd01.c
@@ -87,12 +87,9 @@
{
int i;
int lc;
- const char *msg; /* parse_opts() return message */
char *test_erg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
/*
diff --git a/testcases/kernel/syscalls/getcwd/getcwd02.c b/testcases/kernel/syscalls/getcwd/getcwd02.c
index 0fccec9..030474c 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd02.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd02.c
@@ -87,11 +87,8 @@
FILE *fin;
char *cp;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
/*
diff --git a/testcases/kernel/syscalls/getcwd/getcwd03.c b/testcases/kernel/syscalls/getcwd/getcwd03.c
index 2de03cc..af74608 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd03.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd03.c
@@ -78,11 +78,8 @@
char link2[BUFSIZ];
int n;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getcwd/getcwd04.c b/testcases/kernel/syscalls/getcwd/getcwd04.c
index 8408636..1a5461c 100644
--- a/testcases/kernel/syscalls/getcwd/getcwd04.c
+++ b/testcases/kernel/syscalls/getcwd/getcwd04.c
@@ -56,13 +56,10 @@
int main(int ac, char **av)
{
int status;
- const char *msg;
char cur_cwd[PATH_MAX];
pid_t child;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getdents/getdents01.c b/testcases/kernel/syscalls/getdents/getdents01.c
index 99ad6bb..4dadd4b 100644
--- a/testcases/kernel/syscalls/getdents/getdents01.c
+++ b/testcases/kernel/syscalls/getdents/getdents01.c
@@ -82,12 +82,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int rval, fd;
struct linux_dirent64 *dirp64;
struct linux_dirent *dirp;
void *buf;
+ tst_parse_opts(ac, av, options, &help);
+
/* The buffer is allocated to make sure it's suitably aligned */
buf = malloc(BUFSIZE);
@@ -97,9 +98,6 @@
dirp64 = buf;
dirp = buf;
- if ((msg = parse_opts(ac, av, options, &help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/getdents/getdents02.c b/testcases/kernel/syscalls/getdents/getdents02.c
index 536feef..2c019e5 100644
--- a/testcases/kernel/syscalls/getdents/getdents02.c
+++ b/testcases/kernel/syscalls/getdents/getdents02.c
@@ -80,10 +80,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, options, &help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
setup();
diff --git a/testcases/kernel/syscalls/getdomainname/getdomainname01.c b/testcases/kernel/syscalls/getdomainname/getdomainname01.c
index 3be6296..d40abc8 100644
--- a/testcases/kernel/syscalls/getdomainname/getdomainname01.c
+++ b/testcases/kernel/syscalls/getdomainname/getdomainname01.c
@@ -80,10 +80,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getegid/getegid01.c b/testcases/kernel/syscalls/getegid/getegid01.c
index dd81370..271fbb6 100644
--- a/testcases/kernel/syscalls/getegid/getegid01.c
+++ b/testcases/kernel/syscalls/getegid/getegid01.c
@@ -53,10 +53,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getegid/getegid02.c b/testcases/kernel/syscalls/getegid/getegid02.c
index 3a95fd1..60f0950 100644
--- a/testcases/kernel/syscalls/getegid/getegid02.c
+++ b/testcases/kernel/syscalls/getegid/getegid02.c
@@ -39,12 +39,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t euid;
struct passwd *pwent;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/geteuid/geteuid01.c b/testcases/kernel/syscalls/geteuid/geteuid01.c
index 5e6a8b6..d02fb0a 100644
--- a/testcases/kernel/syscalls/geteuid/geteuid01.c
+++ b/testcases/kernel/syscalls/geteuid/geteuid01.c
@@ -53,10 +53,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/geteuid/geteuid02.c b/testcases/kernel/syscalls/geteuid/geteuid02.c
index 046744d..e00f812 100644
--- a/testcases/kernel/syscalls/geteuid/geteuid02.c
+++ b/testcases/kernel/syscalls/geteuid/geteuid02.c
@@ -33,11 +33,9 @@
{
struct passwd *pwent;
int lc;
- const char *msg;
uid_t uid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getgid/getgid01.c b/testcases/kernel/syscalls/getgid/getgid01.c
index e304695..385c4d5 100644
--- a/testcases/kernel/syscalls/getgid/getgid01.c
+++ b/testcases/kernel/syscalls/getgid/getgid01.c
@@ -52,10 +52,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getgid/getgid03.c b/testcases/kernel/syscalls/getgid/getgid03.c
index 0a85cff..b54fa10 100644
--- a/testcases/kernel/syscalls/getgid/getgid03.c
+++ b/testcases/kernel/syscalls/getgid/getgid03.c
@@ -39,12 +39,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t uid;
struct passwd *pwent;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getgroups/getgroups01.c b/testcases/kernel/syscalls/getgroups/getgroups01.c
index 22966ee..dc3074b 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups01.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups01.c
@@ -68,13 +68,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
GID_T group;
int i;
int entries;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getgroups/getgroups03.c b/testcases/kernel/syscalls/getgroups/getgroups03.c
index 28e80f5..b7b9965 100644
--- a/testcases/kernel/syscalls/getgroups/getgroups03.c
+++ b/testcases/kernel/syscalls/getgroups/getgroups03.c
@@ -58,11 +58,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int gidsetsize = NGROUPS;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c b/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c
index e0ca752..53261ea 100644
--- a/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c
+++ b/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c
@@ -44,11 +44,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/gethostid/gethostid01.c b/testcases/kernel/syscalls/gethostid/gethostid01.c
index d894505..e6b0067 100644
--- a/testcases/kernel/syscalls/gethostid/gethostid01.c
+++ b/testcases/kernel/syscalls/gethostid/gethostid01.c
@@ -139,16 +139,14 @@
int main(int ac, char **av)
{
int lc, i, j; /* loop counters */
- int bit_64 = 0; /* used when compiled 64bit on some 64bit machines */
- const char *msg;
+ int bit_64 = 0;
char *result;
char name[HOSTIDLEN], name2[HOSTIDLEN], hostid[HOSTIDLEN],
hostid2[HOSTIDLEN], *hostid3, hex[2] = "0x";
char hex_64[8] = "ffffffff";
FILE *fp;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/gethostname/gethostname01.c b/testcases/kernel/syscalls/gethostname/gethostname01.c
index 09046b5..a7cb541 100644
--- a/testcases/kernel/syscalls/gethostname/gethostname01.c
+++ b/testcases/kernel/syscalls/gethostname/gethostname01.c
@@ -122,12 +122,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char hname[100]; /* host name */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getitimer/getitimer01.c b/testcases/kernel/syscalls/getitimer/getitimer01.c
index f81ce84..9f6fc5e 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer01.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer01.c
@@ -45,12 +45,9 @@
{
int lc;
int i;
- const char *msg;
struct itimerval value;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getitimer/getitimer02.c b/testcases/kernel/syscalls/getitimer/getitimer02.c
index 6cc4887..b9c0314 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer02.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer02.c
@@ -42,11 +42,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getitimer/getitimer03.c b/testcases/kernel/syscalls/getitimer/getitimer03.c
index bb28cd3..cc5e83f 100644
--- a/testcases/kernel/syscalls/getitimer/getitimer03.c
+++ b/testcases/kernel/syscalls/getitimer/getitimer03.c
@@ -73,12 +73,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct itimerval *value;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/getpagesize/getpagesize01.c b/testcases/kernel/syscalls/getpagesize/getpagesize01.c
index 0397d9e..0d04658 100644
--- a/testcases/kernel/syscalls/getpagesize/getpagesize01.c
+++ b/testcases/kernel/syscalls/getpagesize/getpagesize01.c
@@ -51,14 +51,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int size, ret_sysconf;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpeername/getpeername01.c b/testcases/kernel/syscalls/getpeername/getpeername01.c
index f2356a5..fd5d58d 100644
--- a/testcases/kernel/syscalls/getpeername/getpeername01.c
+++ b/testcases/kernel/syscalls/getpeername/getpeername01.c
@@ -83,12 +83,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpgid/getpgid01.c b/testcases/kernel/syscalls/getpgid/getpgid01.c
index 625d745..1f5b0f9 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid01.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid01.c
@@ -59,14 +59,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* message returned by parse_opts */
register int pgid_0, pgid_1;
register int my_pid, my_ppid;
int ex_stat, fail = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpgid/getpgid02.c b/testcases/kernel/syscalls/getpgid/getpgid02.c
index 7ee694f..65ce049 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid02.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid02.c
@@ -77,11 +77,8 @@
{
int lc;
int i;
- const char *msg; /* message returned by parse_opts */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpgrp/getpgrp01.c b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
index b9d4dab..2adf6b6 100644
--- a/testcases/kernel/syscalls/getpgrp/getpgrp01.c
+++ b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
@@ -125,10 +125,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpid/getpid01.c b/testcases/kernel/syscalls/getpid/getpid01.c
index 418f6b7..b9b069c 100644
--- a/testcases/kernel/syscalls/getpid/getpid01.c
+++ b/testcases/kernel/syscalls/getpid/getpid01.c
@@ -123,10 +123,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpid/getpid02.c b/testcases/kernel/syscalls/getpid/getpid02.c
index 9fb697b..8a4197b 100644
--- a/testcases/kernel/syscalls/getpid/getpid02.c
+++ b/testcases/kernel/syscalls/getpid/getpid02.c
@@ -81,14 +81,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t proc_id; /* process id of the test process */
pid_t pid; /* process id of the child process */
pid_t pproc_id; /* parent process id */
int status; /* exit status of child process */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getppid/getppid01.c b/testcases/kernel/syscalls/getppid/getppid01.c
index d05be6d..a86f825 100644
--- a/testcases/kernel/syscalls/getppid/getppid01.c
+++ b/testcases/kernel/syscalls/getppid/getppid01.c
@@ -125,10 +125,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getppid/getppid02.c b/testcases/kernel/syscalls/getppid/getppid02.c
index b2df424..60181e9 100644
--- a/testcases/kernel/syscalls/getppid/getppid02.c
+++ b/testcases/kernel/syscalls/getppid/getppid02.c
@@ -57,10 +57,8 @@
int lc;
int status;
pid_t pid, ppid;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpriority/getpriority01.c b/testcases/kernel/syscalls/getpriority/getpriority01.c
index d1c2525..e9ff05b 100644
--- a/testcases/kernel/syscalls/getpriority/getpriority01.c
+++ b/testcases/kernel/syscalls/getpriority/getpriority01.c
@@ -86,17 +86,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int ind;
int which; /* scheduling priority category */
TST_TOTAL = sizeof(prio_which) / sizeof(int);
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getpriority/getpriority02.c b/testcases/kernel/syscalls/getpriority/getpriority02.c
index aad6922..b253a00 100644
--- a/testcases/kernel/syscalls/getpriority/getpriority02.c
+++ b/testcases/kernel/syscalls/getpriority/getpriority02.c
@@ -104,17 +104,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int ind; /* counter variable for test case looping */
char *test_desc; /* test specific error message */
int which; /* process priority category */
uid_t who; /* process uid of the test process */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getresgid/getresgid01.c b/testcases/kernel/syscalls/getresgid/getresgid01.c
index bb8328c..51e01be 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid01.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid01.c
@@ -86,15 +86,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
gid_t real_gid, /* real/eff./saved user id from getresgid() */
eff_gid, sav_gid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getresgid/getresgid02.c b/testcases/kernel/syscalls/getresgid/getresgid02.c
index 406c257..0fc5ae4 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid02.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid02.c
@@ -90,15 +90,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
gid_t real_gid, /* real/eff./saved user id from getresgid() */
eff_gid, sav_gid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getresgid/getresgid03.c b/testcases/kernel/syscalls/getresgid/getresgid03.c
index 2764ed5..adf1695 100644
--- a/testcases/kernel/syscalls/getresgid/getresgid03.c
+++ b/testcases/kernel/syscalls/getresgid/getresgid03.c
@@ -91,15 +91,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
gid_t real_gid, /* real/eff./saved user id from getresgid() */
eff_gid, sav_gid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getresuid/getresuid01.c b/testcases/kernel/syscalls/getresuid/getresuid01.c
index 6e7e71e..28e970a 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid01.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid01.c
@@ -85,15 +85,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t real_uid, /* real/eff./saved user id from getresuid() */
eff_uid, sav_uid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getresuid/getresuid02.c b/testcases/kernel/syscalls/getresuid/getresuid02.c
index 0ffd21e..2c86641 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid02.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid02.c
@@ -90,15 +90,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t real_uid, /* real/eff./saved user id from getresuid() */
eff_uid, sav_uid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getresuid/getresuid03.c b/testcases/kernel/syscalls/getresuid/getresuid03.c
index c23c53f..96ff0a6 100644
--- a/testcases/kernel/syscalls/getresuid/getresuid03.c
+++ b/testcases/kernel/syscalls/getresuid/getresuid03.c
@@ -90,15 +90,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t real_uid, /* real/eff./saved user id from getresuid() */
eff_uid, sav_uid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit01.c b/testcases/kernel/syscalls/getrlimit/getrlimit01.c
index b0c441a..68e8bf8 100644
--- a/testcases/kernel/syscalls/getrlimit/getrlimit01.c
+++ b/testcases/kernel/syscalls/getrlimit/getrlimit01.c
@@ -67,11 +67,8 @@
{
int i;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit02.c b/testcases/kernel/syscalls/getrlimit/getrlimit02.c
index ac462b5..f477e20 100644
--- a/testcases/kernel/syscalls/getrlimit/getrlimit02.c
+++ b/testcases/kernel/syscalls/getrlimit/getrlimit02.c
@@ -103,11 +103,8 @@
{
int i;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/* Do initial setup */
setup();
diff --git a/testcases/kernel/syscalls/getrusage/getrusage01.c b/testcases/kernel/syscalls/getrusage/getrusage01.c
index 56ec0c8..ef8df58 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage01.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage01.c
@@ -81,11 +81,9 @@
{
int lc, i;
- const char *msg;
struct rusage usage;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getrusage/getrusage02.c b/testcases/kernel/syscalls/getrusage/getrusage02.c
index 49433b4..8077606 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage02.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage02.c
@@ -102,10 +102,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getrusage/getrusage03.c b/testcases/kernel/syscalls/getrusage/getrusage03.c
index 82ac1fc..54cdc83 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage03.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage03.c
@@ -68,11 +68,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getrusage/getrusage03_child.c b/testcases/kernel/syscalls/getrusage/getrusage03_child.c
index c729fd1..24a6f33 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage03_child.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage03_child.c
@@ -64,11 +64,8 @@
long maxrss_self, maxrss_children, delta;
long consume_nr, grand_consume_nr, self_nr, child_nr;
struct rusage ru;
- const char *msg;
- msg = parse_opts(argc, argv, child_options, usage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, child_options, usage);
setup();
diff --git a/testcases/kernel/syscalls/getrusage/getrusage04.c b/testcases/kernel/syscalls/getrusage/getrusage04.c
index c2f34f4..a5b3f65 100644
--- a/testcases/kernel/syscalls/getrusage/getrusage04.c
+++ b/testcases/kernel/syscalls/getrusage/getrusage04.c
@@ -84,12 +84,9 @@
struct rusage usage;
unsigned long ulast, udelta, slast, sdelta;
int i, lc;
- const char *msg;
char msg_string[BUFSIZ];
- msg = parse_opts(argc, argv, child_options, fusage);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, child_options, fusage);
#if (__powerpc__) || (__powerpc64__) || (__s390__) || (__s390x__)
tst_brkm(TCONF, NULL, "This test is not designed for current system");
diff --git a/testcases/kernel/syscalls/getsid/getsid01.c b/testcases/kernel/syscalls/getsid/getsid01.c
index 5b0970f..5d5282b 100644
--- a/testcases/kernel/syscalls/getsid/getsid01.c
+++ b/testcases/kernel/syscalls/getsid/getsid01.c
@@ -73,12 +73,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid, c_pid, c_sid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/getsid/getsid02.c b/testcases/kernel/syscalls/getsid/getsid02.c
index 13887cb..b5ab339 100644
--- a/testcases/kernel/syscalls/getsid/getsid02.c
+++ b/testcases/kernel/syscalls/getsid/getsid02.c
@@ -35,10 +35,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getsockname/getsockname01.c b/testcases/kernel/syscalls/getsockname/getsockname01.c
index c8378bf..c4b6e9b 100644
--- a/testcases/kernel/syscalls/getsockname/getsockname01.c
+++ b/testcases/kernel/syscalls/getsockname/getsockname01.c
@@ -104,12 +104,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getsockopt/getsockopt01.c b/testcases/kernel/syscalls/getsockopt/getsockopt01.c
index 867a540..1195306 100644
--- a/testcases/kernel/syscalls/getsockopt/getsockopt01.c
+++ b/testcases/kernel/syscalls/getsockopt/getsockopt01.c
@@ -129,12 +129,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/gettid/gettid01.c b/testcases/kernel/syscalls/gettid/gettid01.c
index e53c9b2..7e5b6b1 100644
--- a/testcases/kernel/syscalls/gettid/gettid01.c
+++ b/testcases/kernel/syscalls/gettid/gettid01.c
@@ -48,10 +48,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
index 8a93d4c..583d8f7 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c
@@ -54,12 +54,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int ret;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
index 98dd0ae..8cb1f54 100644
--- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
+++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c
@@ -80,11 +80,8 @@
int main(int ac, char **av)
{
struct timeval tv1, tv2;
- const char *msg;
- if ((msg = parse_opts(ac, av, opts, help)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, opts, help);
tst_sig(NOFORK, DEF_HANDLER, cleanup);
TEST_PAUSE;
diff --git a/testcases/kernel/syscalls/getuid/getuid01.c b/testcases/kernel/syscalls/getuid/getuid01.c
index 224ca0e..50fe1ec 100644
--- a/testcases/kernel/syscalls/getuid/getuid01.c
+++ b/testcases/kernel/syscalls/getuid/getuid01.c
@@ -51,10 +51,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getuid/getuid03.c b/testcases/kernel/syscalls/getuid/getuid03.c
index d92d5e8..7c81c62 100644
--- a/testcases/kernel/syscalls/getuid/getuid03.c
+++ b/testcases/kernel/syscalls/getuid/getuid03.c
@@ -40,11 +40,9 @@
{
struct passwd *pwent;
int lc;
- const char *msg;
uid_t uid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getxattr/getxattr01.c b/testcases/kernel/syscalls/getxattr/getxattr01.c
index 347260f..91d14fa 100644
--- a/testcases/kernel/syscalls/getxattr/getxattr01.c
+++ b/testcases/kernel/syscalls/getxattr/getxattr01.c
@@ -99,11 +99,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getxattr/getxattr02.c b/testcases/kernel/syscalls/getxattr/getxattr02.c
index 65430ab..7a772b8 100644
--- a/testcases/kernel/syscalls/getxattr/getxattr02.c
+++ b/testcases/kernel/syscalls/getxattr/getxattr02.c
@@ -81,12 +81,9 @@
int lc;
int i;
int exp_eno;
- const char *msg;
char buf[BUFSIZ];
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/getxattr/getxattr03.c b/testcases/kernel/syscalls/getxattr/getxattr03.c
index e91ac42..eccfdf2 100644
--- a/testcases/kernel/syscalls/getxattr/getxattr03.c
+++ b/testcases/kernel/syscalls/getxattr/getxattr03.c
@@ -59,11 +59,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/inotify/inotify01.c b/testcases/kernel/syscalls/inotify/inotify01.c
index ee9436c..3d84551 100644
--- a/testcases/kernel/syscalls/inotify/inotify01.c
+++ b/testcases/kernel/syscalls/inotify/inotify01.c
@@ -69,10 +69,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/inotify/inotify02.c b/testcases/kernel/syscalls/inotify/inotify02.c
index 3ccb657..74fd7dd 100644
--- a/testcases/kernel/syscalls/inotify/inotify02.c
+++ b/testcases/kernel/syscalls/inotify/inotify02.c
@@ -80,11 +80,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
unsigned int stored_cookie = UINT_MAX;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/inotify/inotify03.c b/testcases/kernel/syscalls/inotify/inotify03.c
index bb68920..36803d8 100644
--- a/testcases/kernel/syscalls/inotify/inotify03.c
+++ b/testcases/kernel/syscalls/inotify/inotify03.c
@@ -78,13 +78,10 @@
int main(int argc, char *argv[])
{
- const char *msg;
int ret;
int len, i, test_num;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/inotify/inotify04.c b/testcases/kernel/syscalls/inotify/inotify04.c
index c77a7e6..1b6c6d2 100644
--- a/testcases/kernel/syscalls/inotify/inotify04.c
+++ b/testcases/kernel/syscalls/inotify/inotify04.c
@@ -149,15 +149,12 @@
int main(int argc, char **argv)
{
- const char *msg;
int i, test_num, len;
i = 0;
test_num = 0;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/inotify/inotify05.c b/testcases/kernel/syscalls/inotify/inotify05.c
index bce5d8b..bc621b8 100644
--- a/testcases/kernel/syscalls/inotify/inotify05.c
+++ b/testcases/kernel/syscalls/inotify/inotify05.c
@@ -64,12 +64,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
int len, stop;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
index 1ffa188..45928f9 100644
--- a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
+++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c
@@ -123,10 +123,8 @@
{
int fd, coe;
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF, NULL,
diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
index 5fc365e..2d68eaa 100644
--- a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
+++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c
@@ -120,10 +120,8 @@
{
int fd, fl;
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF, NULL,
diff --git a/testcases/kernel/syscalls/io_cancel/io_cancel01.c b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
index 3407edc..8d7ca26 100644
--- a/testcases/kernel/syscalls/io_cancel/io_cancel01.c
+++ b/testcases/kernel/syscalls/io_cancel/io_cancel01.c
@@ -67,14 +67,12 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
io_context_t ctx;
memset(&ctx, 0, sizeof(ctx));
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/io_destroy/io_destroy01.c b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
index cbc5f71..9de4987 100644
--- a/testcases/kernel/syscalls/io_destroy/io_destroy01.c
+++ b/testcases/kernel/syscalls/io_destroy/io_destroy01.c
@@ -62,14 +62,12 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
io_context_t ctx;
memset(&ctx, 0xff, sizeof(ctx));
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/io_getevents/io_getevents01.c b/testcases/kernel/syscalls/io_getevents/io_getevents01.c
index b0a28e1..0f31ece 100644
--- a/testcases/kernel/syscalls/io_getevents/io_getevents01.c
+++ b/testcases/kernel/syscalls/io_getevents/io_getevents01.c
@@ -67,14 +67,12 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
io_context_t ctx;
memset(&ctx, 0, sizeof(ctx));
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/io_setup/io_setup01.c b/testcases/kernel/syscalls/io_setup/io_setup01.c
index b727a4a..829cef5 100644
--- a/testcases/kernel/syscalls/io_setup/io_setup01.c
+++ b/testcases/kernel/syscalls/io_setup/io_setup01.c
@@ -55,13 +55,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
io_context_t ctx;
int expected_return;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/io_submit/io_submit01.c b/testcases/kernel/syscalls/io_submit/io_submit01.c
index 3b15fae..fd01e6e 100644
--- a/testcases/kernel/syscalls/io_submit/io_submit01.c
+++ b/testcases/kernel/syscalls/io_submit/io_submit01.c
@@ -87,7 +87,6 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int rval, fd;
char buf[256];
@@ -95,8 +94,7 @@
struct iocb *iocbs[1];
io_context_t ctx;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ioctl/ioctl01.c b/testcases/kernel/syscalls/ioctl/ioctl01.c
index a73c133..4822d8d 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl01.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl01.c
@@ -99,7 +99,6 @@
static int Devflag;
static char *devname;
-/* for test specific parse_opts options - in this case "-D" */
static option_t options[] = {
{"D:", &Devflag, &devname},
{NULL, NULL, NULL}
@@ -109,11 +108,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (!Devflag)
tst_brkm(TBROK, NULL, "You must specify a tty device with "
diff --git a/testcases/kernel/syscalls/ioctl/ioctl02.c b/testcases/kernel/syscalls/ioctl/ioctl02.c
index 739abed..47102ca 100644
--- a/testcases/kernel/syscalls/ioctl/ioctl02.c
+++ b/testcases/kernel/syscalls/ioctl/ioctl02.c
@@ -96,7 +96,6 @@
static int Devflag;
static char *devname;
-/* for test specific parse_opts options - in this case "-D" */
static option_t options[] = {
{"D:", &Devflag, &devname},
{NULL, NULL, NULL}
@@ -106,11 +105,9 @@
{
int lc;
int rval;
- const char *msg;
- msg = parse_opts(ac, av, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
+
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "dS", &parentpid, &childtty);
#endif
diff --git a/testcases/kernel/syscalls/ioperm/ioperm01.c b/testcases/kernel/syscalls/ioperm/ioperm01.c
index 8816d97..8807b69 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm01.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm01.c
@@ -90,10 +90,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ioperm/ioperm02.c b/testcases/kernel/syscalls/ioperm/ioperm02.c
index 61eeef3..7e39fc0 100644
--- a/testcases/kernel/syscalls/ioperm/ioperm02.c
+++ b/testcases/kernel/syscalls/ioperm/ioperm02.c
@@ -109,10 +109,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/iopl/iopl01.c b/testcases/kernel/syscalls/iopl/iopl01.c
index c44fc9a..ff0057b 100644
--- a/testcases/kernel/syscalls/iopl/iopl01.c
+++ b/testcases/kernel/syscalls/iopl/iopl01.c
@@ -84,10 +84,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/iopl/iopl02.c b/testcases/kernel/syscalls/iopl/iopl02.c
index dc4522c..398dca8 100644
--- a/testcases/kernel/syscalls/iopl/iopl02.c
+++ b/testcases/kernel/syscalls/iopl/iopl02.c
@@ -106,10 +106,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
index e6be4c2..1838962 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c
@@ -70,10 +70,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
index 68b0ee2..1b39091 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c
@@ -72,10 +72,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
index 13b14cf..4693b89 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c
@@ -68,10 +68,8 @@
int main(int ac, char **av)
{
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
index 8e6def7..a8151cb 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c
@@ -101,11 +101,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
index a8bbdc0..e737fc8 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c
@@ -72,12 +72,10 @@
int main(int ac, char **av)
{
- const char *msg;
pid_t pid;
void do_child(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c
index a20565b..ac1215c 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c
@@ -76,10 +76,8 @@
sighandler_t alrm();
#ifdef UCLINUX
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&do_child_1, "ndd", 1, &msqid, &c1_msgp.type);
maybe_run_child(&do_child_2, "ndddd", 2, &msqid, &c1_msgp.type,
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
index 08cd02c..eca50c5 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c
@@ -82,12 +82,10 @@
struct sigaction act;
#ifdef UCLINUX
- const char *msg;
argv0 = argv[0];
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
&i_uclinux);
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
index 22fc895..8dc75cf 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c
@@ -85,12 +85,10 @@
int count, status;
#ifdef UCLINUX
- const char *msg;
argv0 = argv[0];
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
&i_uclinux);
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
index 137fa26..475fb73 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c
@@ -79,12 +79,10 @@
struct sigaction act;
#ifdef UCLINUX
- const char *msg;
argv0 = argv[0];
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
&i_uclinux);
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
index beeb165..8fcefff 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c
@@ -88,12 +88,10 @@
int i, j, ok;
#ifdef UCLINUX
- const char *msg;
argv0 = argv[0];
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux,
&i_uclinux);
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
index c141710..2621f80 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c
@@ -49,12 +49,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c
index d7eb116..e170d6b 100644
--- a/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c
+++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c
@@ -33,11 +33,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget01.c b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
index a29abbe..e8208b7 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget01.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget01.c
@@ -67,11 +67,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void check_functionality(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget02.c b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
index 3b76713..be9bc61 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget02.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget02.c
@@ -81,12 +81,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
key_t key;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget03.c b/testcases/kernel/syscalls/ipc/msgget/msgget03.c
index 7c1527d..2eda252 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget03.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget03.c
@@ -67,11 +67,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int msg_q;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c
index 939c169..516df18 100644
--- a/testcases/kernel/syscalls/ipc/msgget/msgget04.c
+++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c
@@ -70,11 +70,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
index 95b52bc..375d262 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c
@@ -79,12 +79,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void check_functionality(void);
int status, e_code;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "d", &msg_q_1);
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
index 61bc26a..36cc829 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c
@@ -92,11 +92,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
index 93dbfed..762b4d5 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c
@@ -80,11 +80,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
index e0fb837..833ad1a 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c
@@ -91,11 +91,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
index 6b4acb4..7a8b680 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c
@@ -81,10 +81,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "d", &msg_q_1);
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
index 39dab58..a27d093 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c
@@ -83,10 +83,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "d", &msg_q_1);
diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c
index 2f09f40..44f1c1d 100644
--- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c
+++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c
@@ -44,12 +44,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
index 0caff55..0ca2be0 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c
@@ -75,10 +75,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
index e68b7c6..8b23f83 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c
@@ -83,11 +83,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
index 35e0657..ef6e58e 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c
@@ -89,11 +89,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
index 95d46a6..4432d67 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c
@@ -68,10 +68,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
index ffecc75..16d62f8 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c
@@ -84,11 +84,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t c_pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "d", &msg_q_1);
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
index 71bcb8a..42f6e79 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
+++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c
@@ -78,12 +78,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t c_pid;
int status, e_code;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
#define PIPE_NAME "msgsnd06"
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl01.c b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
index 3a9ea01..9a516ed 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl01.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl01.c
@@ -123,12 +123,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i, j;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl02.c b/testcases/kernel/syscalls/ipc/semctl/semctl02.c
index fb95e18..10d48da 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl02.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl02.c
@@ -64,13 +64,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct semid_ds sem_ds;
union semun un_arg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c
index 13ec178..c100650 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c
@@ -96,11 +96,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl04.c b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
index 93e33d9..d02cd77 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl04.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl04.c
@@ -74,12 +74,10 @@
int main(int ac, char **av)
{
- const char *msg;
pid_t pid;
void do_child(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl05.c b/testcases/kernel/syscalls/ipc/semctl/semctl05.c
index 6e49516..8653054 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl05.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl05.c
@@ -95,11 +95,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl06.c b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
index 08b151f..c298345 100644
--- a/testcases/kernel/syscalls/ipc/semctl/semctl06.c
+++ b/testcases/kernel/syscalls/ipc/semctl/semctl06.c
@@ -104,9 +104,8 @@
int count, child, status, nwait;
#ifdef UCLINUX
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+ tst_parse_opts(argc, argv, NULL, NULL);
argv0 = argv[0];
maybe_run_child(&do_child, "dS", &id_uclinux, &maxsemstring);
diff --git a/testcases/kernel/syscalls/ipc/semget/semget01.c b/testcases/kernel/syscalls/ipc/semget/semget01.c
index dfc0755..a6cdd2d 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget01.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget01.c
@@ -66,11 +66,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void check_functionality(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semget/semget02.c b/testcases/kernel/syscalls/ipc/semget/semget02.c
index 1e2448b..9ba1fb9 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget02.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget02.c
@@ -77,11 +77,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semget/semget03.c b/testcases/kernel/syscalls/ipc/semget/semget03.c
index a4c3b71..976c78a 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget03.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget03.c
@@ -60,10 +60,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semget/semget05.c b/testcases/kernel/syscalls/ipc/semget/semget05.c
index e550443..9767696 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget05.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget05.c
@@ -66,11 +66,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
FILE *fp;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/* Set the MAXIDS for the specific machine by reading the system limit
* for SEMMNI - The maximum number of sempahore sets
diff --git a/testcases/kernel/syscalls/ipc/semget/semget06.c b/testcases/kernel/syscalls/ipc/semget/semget06.c
index def90b8..858006d 100644
--- a/testcases/kernel/syscalls/ipc/semget/semget06.c
+++ b/testcases/kernel/syscalls/ipc/semget/semget06.c
@@ -65,11 +65,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semop/semop01.c b/testcases/kernel/syscalls/ipc/semop/semop01.c
index 55f532a..ea05c53 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop01.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop01.c
@@ -67,12 +67,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
int fail = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/semop/semop02.c b/testcases/kernel/syscalls/ipc/semop/semop02.c
index deb1630..6d3b3ec 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop02.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop02.c
@@ -68,12 +68,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/semop/semop03.c b/testcases/kernel/syscalls/ipc/semop/semop03.c
index afae9ee..a904e99 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop03.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop03.c
@@ -64,11 +64,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semop/semop04.c b/testcases/kernel/syscalls/ipc/semop/semop04.c
index 3a82f11..bf425b5 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop04.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop04.c
@@ -77,13 +77,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int val; /* value for SETVAL */
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/semop/semop05.c b/testcases/kernel/syscalls/ipc/semop/semop05.c
index 733f4f5..34bb4da 100644
--- a/testcases/kernel/syscalls/ipc/semop/semop05.c
+++ b/testcases/kernel/syscalls/ipc/semop/semop05.c
@@ -102,13 +102,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
pid_t pid;
void do_child();
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "dd", &i_uclinux, &sem_id_1);
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat01.c b/testcases/kernel/syscalls/ipc/shmat/shmat01.c
index d3a3a99..6de1872 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat01.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat01.c
@@ -70,12 +70,9 @@
int main(int argc, char *argv[])
{
int lc, i;
- const char *msg;
void *attchaddr;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat02.c b/testcases/kernel/syscalls/ipc/shmat/shmat02.c
index cf5c1b1..699a392 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat02.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat02.c
@@ -101,15 +101,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
struct test_case_t *tc;
tc = NULL;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
tc = malloc(sizeof(struct test_case_t));
if (tc == NULL)
diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat03.c b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
index 4c2542f..35f14d1 100644
--- a/testcases/kernel/syscalls/ipc/shmat/shmat03.c
+++ b/testcases/kernel/syscalls/ipc/shmat/shmat03.c
@@ -72,12 +72,9 @@
int main(int ac, char **av)
{
- const char *msg;
int pid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
index 9c85a8e..ac66ceb 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c
@@ -129,12 +129,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
maybe_run_child(do_child, "ddd", &stat_i, &stat_time, &shm_id_1);
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
index af2551b..7559590 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c
@@ -102,11 +102,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
index bb5d7cd..5cb2ad5 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c
@@ -89,12 +89,10 @@
int main(int ac, char **av)
{
- const char *msg;
int pid;
void do_child(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
index 9b0353b..c9d13d4 100644
--- a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
+++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c
@@ -57,10 +57,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
index 3d16276..fc167e7 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
+++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c
@@ -78,11 +78,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void check_functionality(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
index aad826c..5cab259 100644
--- a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
+++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c
@@ -57,11 +57,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int unshared; /* a local variable to use to produce *//* the error in the shmdt() call */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget01.c b/testcases/kernel/syscalls/ipc/shmget/shmget01.c
index e5d022f..ae63baf 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget01.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget01.c
@@ -66,11 +66,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct shmid_ds buf;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget02.c b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
index 91920d1..71d1616 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget02.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget02.c
@@ -89,11 +89,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget03.c b/testcases/kernel/syscalls/ipc/shmget/shmget03.c
index e1d9861..b9ff1a4 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget03.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget03.c
@@ -69,10 +69,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget04.c b/testcases/kernel/syscalls/ipc/shmget/shmget04.c
index fdf8d59..47fccb7 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget04.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget04.c
@@ -63,10 +63,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget05.c b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
index 444be44..ef3bb13 100644
--- a/testcases/kernel/syscalls/ipc/shmget/shmget05.c
+++ b/testcases/kernel/syscalls/ipc/shmget/shmget05.c
@@ -70,12 +70,10 @@
int main(int ac, char **av)
{
- const char *msg;
int pid;
void do_child(void);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/keyctl/keyctl01.c b/testcases/kernel/syscalls/keyctl/keyctl01.c
index f45424f..30503ff 100644
--- a/testcases/kernel/syscalls/keyctl/keyctl01.c
+++ b/testcases/kernel/syscalls/keyctl/keyctl01.c
@@ -59,10 +59,8 @@
int ret;
int lc;
int32_t ne_key;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/kill/kill01.c b/testcases/kernel/syscalls/kill/kill01.c
index 9d3490c..0aa77b9 100644
--- a/testcases/kernel/syscalls/kill/kill01.c
+++ b/testcases/kernel/syscalls/kill/kill01.c
@@ -73,13 +73,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int exno, status, nsig;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/kill/kill02.c b/testcases/kernel/syscalls/kill/kill02.c
index c918e62..9d6cc68 100644
--- a/testcases/kernel/syscalls/kill/kill02.c
+++ b/testcases/kernel/syscalls/kill/kill02.c
@@ -212,10 +212,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/kill/kill03.c b/testcases/kernel/syscalls/kill/kill03.c
index 3f8d151..5770ae0 100644
--- a/testcases/kernel/syscalls/kill/kill03.c
+++ b/testcases/kernel/syscalls/kill/kill03.c
@@ -73,13 +73,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int exno, status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/kill/kill04.c b/testcases/kernel/syscalls/kill/kill04.c
index f5bad03..f3bec13 100644
--- a/testcases/kernel/syscalls/kill/kill04.c
+++ b/testcases/kernel/syscalls/kill/kill04.c
@@ -73,12 +73,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t fake_pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/kill/kill05.c b/testcases/kernel/syscalls/kill/kill05.c
index f6ea53a..510bcee 100644
--- a/testcases/kernel/syscalls/kill/kill05.c
+++ b/testcases/kernel/syscalls/kill/kill05.c
@@ -100,12 +100,10 @@
int main(int ac, char **av)
{
- const char *msg;
pid_t pid;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/kill/kill06.c b/testcases/kernel/syscalls/kill/kill06.c
index 889c3fa..aa6ba5d 100644
--- a/testcases/kernel/syscalls/kill/kill06.c
+++ b/testcases/kernel/syscalls/kill/kill06.c
@@ -74,13 +74,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid1, pid2;
int exno, status, nsig, i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/kill/kill07.c b/testcases/kernel/syscalls/kill/kill07.c
index 1721233..b71064a 100644
--- a/testcases/kernel/syscalls/kill/kill07.c
+++ b/testcases/kernel/syscalls/kill/kill07.c
@@ -86,14 +86,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int exno, status, nsig, asig, ret;
struct sigaction my_act, old_act;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/kill/kill08.c b/testcases/kernel/syscalls/kill/kill08.c
index f643279..b0826c2 100644
--- a/testcases/kernel/syscalls/kill/kill08.c
+++ b/testcases/kernel/syscalls/kill/kill08.c
@@ -74,13 +74,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid1, pid2;
int exno, status, nsig, i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/kill/kill09.c b/testcases/kernel/syscalls/kill/kill09.c
index b60dea9..c587892 100644
--- a/testcases/kernel/syscalls/kill/kill09.c
+++ b/testcases/kernel/syscalls/kill/kill09.c
@@ -131,11 +131,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/kill/kill10.c b/testcases/kernel/syscalls/kill/kill10.c
index 9df9126..982d9da 100644
--- a/testcases/kernel/syscalls/kill/kill10.c
+++ b/testcases/kernel/syscalls/kill/kill10.c
@@ -204,7 +204,6 @@
char *narg, *garg, *darg;
int nflag = 0, gflag = 0, dflag = 0;
-/* for test specific parse_opts options */
option_t options[] = {
{"n:", &nflag, &narg}, /* -n #procs */
{"g:", &gflag, &garg}, /* -g #pgrps */
@@ -215,12 +214,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int cnt;
- if ((msg = parse_opts(ac, av, options, &help))) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, options, &help);
if (nflag) {
if (sscanf(narg, "%i", &num_procs) != 1) {
diff --git a/testcases/kernel/syscalls/kill/kill11.c b/testcases/kernel/syscalls/kill/kill11.c
index 7441650..83fba5b 100644
--- a/testcases/kernel/syscalls/kill/kill11.c
+++ b/testcases/kernel/syscalls/kill/kill11.c
@@ -162,10 +162,8 @@
{
int lc;
unsigned int i;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "dd", &sig);
diff --git a/testcases/kernel/syscalls/kill/kill12.c b/testcases/kernel/syscalls/kill/kill12.c
index 9f2ad8e..7a47a4a 100644
--- a/testcases/kernel/syscalls/kill/kill12.c
+++ b/testcases/kernel/syscalls/kill/kill12.c
@@ -86,11 +86,8 @@
void chsig();
#ifdef UCLINUX
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&do_child, "dd", &temp, &sig);
#endif
diff --git a/testcases/kernel/syscalls/lchown/lchown01.c b/testcases/kernel/syscalls/lchown/lchown01.c
index 261ceb9..37fa70f 100644
--- a/testcases/kernel/syscalls/lchown/lchown01.c
+++ b/testcases/kernel/syscalls/lchown/lchown01.c
@@ -72,11 +72,9 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lchown/lchown02.c b/testcases/kernel/syscalls/lchown/lchown02.c
index baccd28..ce0a69f 100644
--- a/testcases/kernel/syscalls/lchown/lchown02.c
+++ b/testcases/kernel/syscalls/lchown/lchown02.c
@@ -108,13 +108,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
uid_t user_id;
gid_t group_id;
int i;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lchown/lchown03.c b/testcases/kernel/syscalls/lchown/lchown03.c
index 25c9e36..f08ad2f 100644
--- a/testcases/kernel/syscalls/lchown/lchown03.c
+++ b/testcases/kernel/syscalls/lchown/lchown03.c
@@ -68,11 +68,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/link/link02.c b/testcases/kernel/syscalls/link/link02.c
index b9a32f1..9f8cd76 100644
--- a/testcases/kernel/syscalls/link/link02.c
+++ b/testcases/kernel/syscalls/link/link02.c
@@ -84,10 +84,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/link/link03.c b/testcases/kernel/syscalls/link/link03.c
index 10a8d02..b6c4809 100644
--- a/testcases/kernel/syscalls/link/link03.c
+++ b/testcases/kernel/syscalls/link/link03.c
@@ -68,13 +68,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct stat buf;
int i, links;
char lname[255];
- if ((msg = parse_opts(ac, av, options, &help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (links_arg) {
nlinks = atoi(links_arg);
diff --git a/testcases/kernel/syscalls/link/link04.c b/testcases/kernel/syscalls/link/link04.c
index 4bdc547..8296eba 100644
--- a/testcases/kernel/syscalls/link/link04.c
+++ b/testcases/kernel/syscalls/link/link04.c
@@ -102,13 +102,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *fname1, *fname2;
char *desc1, *desc2;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/link/link05.c b/testcases/kernel/syscalls/link/link05.c
index d83c6e7..3867632 100644
--- a/testcases/kernel/syscalls/link/link05.c
+++ b/testcases/kernel/syscalls/link/link05.c
@@ -69,13 +69,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct stat fbuf, lbuf;
int cnt;
char lname[255];
- if ((msg = parse_opts(ac, av, options, &help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (links_arg) {
nlinks = atoi(links_arg);
diff --git a/testcases/kernel/syscalls/link/link06.c b/testcases/kernel/syscalls/link/link06.c
index 41c69ec..2b3f380 100644
--- a/testcases/kernel/syscalls/link/link06.c
+++ b/testcases/kernel/syscalls/link/link06.c
@@ -54,10 +54,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/link/link07.c b/testcases/kernel/syscalls/link/link07.c
index 163fdaf..70fefa6 100644
--- a/testcases/kernel/syscalls/link/link07.c
+++ b/testcases/kernel/syscalls/link/link07.c
@@ -54,10 +54,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/link/link08.c b/testcases/kernel/syscalls/link/link08.c
index 477702a..7d7c2bb 100644
--- a/testcases/kernel/syscalls/link/link08.c
+++ b/testcases/kernel/syscalls/link/link08.c
@@ -82,11 +82,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c
index f378f70..fc0687b 100644
--- a/testcases/kernel/syscalls/linkat/linkat01.c
+++ b/testcases/kernel/syscalls/linkat/linkat01.c
@@ -209,7 +209,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
if ((tst_kvercmp(2, 6, 16)) < 0) {
@@ -218,8 +217,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/linkat/linkat02.c b/testcases/kernel/syscalls/linkat/linkat02.c
index 0ddf234..1b0d8c5 100644
--- a/testcases/kernel/syscalls/linkat/linkat02.c
+++ b/testcases/kernel/syscalls/linkat/linkat02.c
@@ -87,12 +87,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/listen/listen01.c b/testcases/kernel/syscalls/listen/listen01.c
index 1fdb241..e421bb4 100644
--- a/testcases/kernel/syscalls/listen/listen01.c
+++ b/testcases/kernel/syscalls/listen/listen01.c
@@ -84,12 +84,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c
index a8e44a8..b956dbf 100644
--- a/testcases/kernel/syscalls/llseek/llseek01.c
+++ b/testcases/kernel/syscalls/llseek/llseek01.c
@@ -101,11 +101,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
loff_t offset; /* Ret value from llseek */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
offset = -1;
diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c
index 1c93661..9227f70 100644
--- a/testcases/kernel/syscalls/llseek/llseek02.c
+++ b/testcases/kernel/syscalls/llseek/llseek02.c
@@ -118,17 +118,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fildes; /* file handle for testfile */
int whence; /* position of file handle in the file */
char *test_desc; /* test specific error message */
int ind; /* counter to test different test conditions */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/llseek/llseek03.c b/testcases/kernel/syscalls/llseek/llseek03.c
index d06c6f6..4c08a8e 100644
--- a/testcases/kernel/syscalls/llseek/llseek03.c
+++ b/testcases/kernel/syscalls/llseek/llseek03.c
@@ -62,11 +62,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lseek/lseek01.c b/testcases/kernel/syscalls/lseek/lseek01.c
index 1649ae9..9135a87 100644
--- a/testcases/kernel/syscalls/lseek/lseek01.c
+++ b/testcases/kernel/syscalls/lseek/lseek01.c
@@ -131,7 +131,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int ind;
int offset;
@@ -139,10 +138,7 @@
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/lseek/lseek02.c b/testcases/kernel/syscalls/lseek/lseek02.c
index 3b98441..8d11bdb 100644
--- a/testcases/kernel/syscalls/lseek/lseek02.c
+++ b/testcases/kernel/syscalls/lseek/lseek02.c
@@ -131,15 +131,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/lseek/lseek03.c b/testcases/kernel/syscalls/lseek/lseek03.c
index d9e41ca..02b94fb 100644
--- a/testcases/kernel/syscalls/lseek/lseek03.c
+++ b/testcases/kernel/syscalls/lseek/lseek03.c
@@ -53,10 +53,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lseek/lseek04.c b/testcases/kernel/syscalls/lseek/lseek04.c
index 7693ad5..a07cc5f 100644
--- a/testcases/kernel/syscalls/lseek/lseek04.c
+++ b/testcases/kernel/syscalls/lseek/lseek04.c
@@ -130,15 +130,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/lseek/lseek05.c b/testcases/kernel/syscalls/lseek/lseek05.c
index 9068d04..daf15e5 100644
--- a/testcases/kernel/syscalls/lseek/lseek05.c
+++ b/testcases/kernel/syscalls/lseek/lseek05.c
@@ -131,15 +131,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/lseek/lseek06.c b/testcases/kernel/syscalls/lseek/lseek06.c
index 53fcf72..056eb40 100644
--- a/testcases/kernel/syscalls/lseek/lseek06.c
+++ b/testcases/kernel/syscalls/lseek/lseek06.c
@@ -92,11 +92,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char read_buf[1]; /* data read from temp. file */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lseek/lseek07.c b/testcases/kernel/syscalls/lseek/lseek07.c
index 4ae1bce..6dfcab5 100644
--- a/testcases/kernel/syscalls/lseek/lseek07.c
+++ b/testcases/kernel/syscalls/lseek/lseek07.c
@@ -95,12 +95,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char read_buf[BUFSIZ]; /* data read from temp. file */
off_t offset; /* byte position in temporary file */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lseek/lseek08.c b/testcases/kernel/syscalls/lseek/lseek08.c
index 200c584..49e787a 100644
--- a/testcases/kernel/syscalls/lseek/lseek08.c
+++ b/testcases/kernel/syscalls/lseek/lseek08.c
@@ -92,11 +92,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char read_buf[1]; /* data read from temp. file */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lseek/lseek09.c b/testcases/kernel/syscalls/lseek/lseek09.c
index 20e6a87..38b1234 100644
--- a/testcases/kernel/syscalls/lseek/lseek09.c
+++ b/testcases/kernel/syscalls/lseek/lseek09.c
@@ -94,11 +94,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char read_buf[BUFSIZ]; /* data read from temp. file */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lseek/lseek10.c b/testcases/kernel/syscalls/lseek/lseek10.c
index 0616ad0..7ee25af 100644
--- a/testcases/kernel/syscalls/lseek/lseek10.c
+++ b/testcases/kernel/syscalls/lseek/lseek10.c
@@ -122,14 +122,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fildes; /* file handle for testfile */
int whence; /* position of file handle in the file */
char *test_desc; /* test specific error message */
int ind; /* counter to test different test conditions */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lstat/lstat01.c b/testcases/kernel/syscalls/lstat/lstat01.c
index 136f256..cd5263f 100644
--- a/testcases/kernel/syscalls/lstat/lstat01.c
+++ b/testcases/kernel/syscalls/lstat/lstat01.c
@@ -130,13 +130,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/lstat/lstat02.c b/testcases/kernel/syscalls/lstat/lstat02.c
index 3b2c45a..64bd37b 100644
--- a/testcases/kernel/syscalls/lstat/lstat02.c
+++ b/testcases/kernel/syscalls/lstat/lstat02.c
@@ -91,11 +91,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/lstat/lstat03.c b/testcases/kernel/syscalls/lstat/lstat03.c
index a2a42b0..9e1c30b 100644
--- a/testcases/kernel/syscalls/lstat/lstat03.c
+++ b/testcases/kernel/syscalls/lstat/lstat03.c
@@ -62,11 +62,8 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/madvise/madvise01.c b/testcases/kernel/syscalls/madvise/madvise01.c
index bd139ec..4b1286d 100644
--- a/testcases/kernel/syscalls/madvise/madvise01.c
+++ b/testcases/kernel/syscalls/madvise/madvise01.c
@@ -47,15 +47,11 @@
int i = 0;
char *file = NULL;
struct stat stat;
-
- const char *msg = NULL;
char filename[64];
char *progname = NULL;
char *str_for_file = "abcdefghijklmnopqrstuvwxyz12345\n";
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/madvise/madvise02.c b/testcases/kernel/syscalls/madvise/madvise02.c
index 5417470..b9eb77d 100644
--- a/testcases/kernel/syscalls/madvise/madvise02.c
+++ b/testcases/kernel/syscalls/madvise/madvise02.c
@@ -103,11 +103,8 @@
{
int lc;
int i;
- const char *msg = NULL;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/madvise/madvise03.c b/testcases/kernel/syscalls/madvise/madvise03.c
index d59edac..3da2bb2 100644
--- a/testcases/kernel/syscalls/madvise/madvise03.c
+++ b/testcases/kernel/syscalls/madvise/madvise03.c
@@ -55,15 +55,11 @@
struct stat stat;
void *addr1;
long shm_size = 0;
-
- const char *msg = NULL;
char filename[64];
char *progname = NULL;
char *str_for_file = "abcdefghijklmnopqrstuvwxyz12345\n";
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/madvise/madvise04.c b/testcases/kernel/syscalls/madvise/madvise04.c
index db5b92b..e89babc 100644
--- a/testcases/kernel/syscalls/madvise/madvise04.c
+++ b/testcases/kernel/syscalls/madvise/madvise04.c
@@ -47,15 +47,11 @@
int i;
char *file = NULL;
struct stat stat;
-
- const char *msg;
char filename[64];
char *progname = NULL;
char *str_for_file = "abcdefghijklmnopqrstuvwxyz12345\n";
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/madvise/madvise05.c b/testcases/kernel/syscalls/madvise/madvise05.c
index 6fbd208..cdbc26f 100644
--- a/testcases/kernel/syscalls/madvise/madvise05.c
+++ b/testcases/kernel/syscalls/madvise/madvise05.c
@@ -41,12 +41,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg = NULL;
void *p;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mbind/mbind01.c b/testcases/kernel/syscalls/mbind/mbind01.c
index c4c71ac..d56f39e 100644
--- a/testcases/kernel/syscalls/mbind/mbind01.c
+++ b/testcases/kernel/syscalls/mbind/mbind01.c
@@ -180,12 +180,9 @@
int main(int argc, char **argv)
{
- const char *msg;
int lc, i, ret;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
testno = (int)(sizeof(tcase) / sizeof(tcase[0]));
diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c
index 97d6480..1a3297c 100644
--- a/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c
+++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c
@@ -202,11 +202,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, options, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c
index 4d62ad9..efc50de 100644
--- a/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c
+++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c
@@ -318,11 +318,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, options, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/mincore/mincore01.c b/testcases/kernel/syscalls/mincore/mincore01.c
index 65220c7..97a3d95 100644
--- a/testcases/kernel/syscalls/mincore/mincore01.c
+++ b/testcases/kernel/syscalls/mincore/mincore01.c
@@ -83,11 +83,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, cleanup, "error parsing options: %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mincore/mincore02.c b/testcases/kernel/syscalls/mincore/mincore02.c
index 7de8ad4..713473a 100644
--- a/testcases/kernel/syscalls/mincore/mincore02.c
+++ b/testcases/kernel/syscalls/mincore/mincore02.c
@@ -101,15 +101,12 @@
int main(int argc, char **argv)
{
int lock_pages, counter;
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, cleanup, "error parsing options: %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
-
+
for (lc = 0; TEST_LOOPING(lc); lc++) {
tst_count = 0;
diff --git a/testcases/kernel/syscalls/mkdir/mkdir01.c b/testcases/kernel/syscalls/mkdir/mkdir01.c
index b637ab6..9839a09 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir01.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir01.c
@@ -123,10 +123,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mkdir/mkdir02.c b/testcases/kernel/syscalls/mkdir/mkdir02.c
index 4418dad..706106a 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir02.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir02.c
@@ -95,7 +95,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct stat buf, buf1;
pid_t pid, pid1;
int rval, status;
@@ -103,9 +102,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/mkdir/mkdir03.c b/testcases/kernel/syscalls/mkdir/mkdir03.c
index 0bd5978..6cff3aa 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir03.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir03.c
@@ -77,11 +77,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mkdir/mkdir04.c b/testcases/kernel/syscalls/mkdir/mkdir04.c
index c4918ff..4667a89 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir04.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir04.c
@@ -97,7 +97,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int rval;
pid_t pid, pid1;
int status;
@@ -105,9 +104,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/mkdir/mkdir05.c b/testcases/kernel/syscalls/mkdir/mkdir05.c
index 37e165d..1a6d569 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir05.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir05.c
@@ -48,15 +48,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct stat buf;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/mkdir/mkdir08.c b/testcases/kernel/syscalls/mkdir/mkdir08.c
index 43b3b95..752763a 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir08.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir08.c
@@ -129,13 +129,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c b/testcases/kernel/syscalls/mkdir/mkdir09.c
index 1cd5fb2..41c20e9 100644
--- a/testcases/kernel/syscalls/mkdir/mkdir09.c
+++ b/testcases/kernel/syscalls/mkdir/mkdir09.c
@@ -104,11 +104,8 @@
int c;
#ifdef UCLINUX
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
argv0 = argv[0];
maybe_run_child(&dochild1_uclinux, "nd", 1, &nfiles);
diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
index 2222c63..7e15947 100644
--- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
@@ -109,11 +109,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat02.c b/testcases/kernel/syscalls/mkdirat/mkdirat02.c
index 0e354cc..36c1f15 100644
--- a/testcases/kernel/syscalls/mkdirat/mkdirat02.c
+++ b/testcases/kernel/syscalls/mkdirat/mkdirat02.c
@@ -66,11 +66,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod01.c b/testcases/kernel/syscalls/mknod/mknod01.c
index f2abd2c..86e63e2 100644
--- a/testcases/kernel/syscalls/mknod/mknod01.c
+++ b/testcases/kernel/syscalls/mknod/mknod01.c
@@ -66,10 +66,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod02.c b/testcases/kernel/syscalls/mknod/mknod02.c
index 00cb930..ac52f20 100644
--- a/testcases/kernel/syscalls/mknod/mknod02.c
+++ b/testcases/kernel/syscalls/mknod/mknod02.c
@@ -104,14 +104,9 @@
int main(int ac, char **av)
{
int lc;
- int fflag; /* functionality flag variable */
- const char *msg;
+ int fflag;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod03.c b/testcases/kernel/syscalls/mknod/mknod03.c
index 03559a1..5e26706 100644
--- a/testcases/kernel/syscalls/mknod/mknod03.c
+++ b/testcases/kernel/syscalls/mknod/mknod03.c
@@ -104,14 +104,9 @@
int main(int ac, char **av)
{
int lc;
- int fflag; /* functionality flag variable */
- const char *msg;
+ int fflag;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod04.c b/testcases/kernel/syscalls/mknod/mknod04.c
index 9bbaba2..d6356aa 100644
--- a/testcases/kernel/syscalls/mknod/mknod04.c
+++ b/testcases/kernel/syscalls/mknod/mknod04.c
@@ -104,14 +104,9 @@
int main(int ac, char **av)
{
int lc;
- int fflag; /* functionality flag variable */
- const char *msg;
+ int fflag;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod05.c b/testcases/kernel/syscalls/mknod/mknod05.c
index 7bcfb55..3b3059e 100644
--- a/testcases/kernel/syscalls/mknod/mknod05.c
+++ b/testcases/kernel/syscalls/mknod/mknod05.c
@@ -104,14 +104,9 @@
int main(int ac, char **av)
{
int lc;
- int fflag; /* functionality flag variable */
- const char *msg;
+ int fflag;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod06.c b/testcases/kernel/syscalls/mknod/mknod06.c
index ebd67bd..e82acad 100644
--- a/testcases/kernel/syscalls/mknod/mknod06.c
+++ b/testcases/kernel/syscalls/mknod/mknod06.c
@@ -132,16 +132,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *node_name; /* ptr. for node name created */
char *test_desc; /* test specific error message */
int ind; /* counter to test different test conditions */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Invoke setup function to call individual test setup functions
diff --git a/testcases/kernel/syscalls/mknod/mknod07.c b/testcases/kernel/syscalls/mknod/mknod07.c
index 02c1363..bf9b8b1 100644
--- a/testcases/kernel/syscalls/mknod/mknod07.c
+++ b/testcases/kernel/syscalls/mknod/mknod07.c
@@ -88,12 +88,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod08.c b/testcases/kernel/syscalls/mknod/mknod08.c
index 400c06d..403eb0b 100644
--- a/testcases/kernel/syscalls/mknod/mknod08.c
+++ b/testcases/kernel/syscalls/mknod/mknod08.c
@@ -103,14 +103,9 @@
int main(int ac, char **av)
{
int lc;
- int fflag; /* functionality flag variable */
- const char *msg;
+ int fflag;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknod/mknod09.c b/testcases/kernel/syscalls/mknod/mknod09.c
index a5ee9e6..a785eb8 100644
--- a/testcases/kernel/syscalls/mknod/mknod09.c
+++ b/testcases/kernel/syscalls/mknod/mknod09.c
@@ -82,14 +82,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *test_desc; /* test specific error message */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
index e8f0394..26e5538 100644
--- a/testcases/kernel/syscalls/mknodat/mknodat01.c
+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
@@ -96,11 +96,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c b/testcases/kernel/syscalls/mknodat/mknodat02.c
index e52647e..7e7a830 100644
--- a/testcases/kernel/syscalls/mknodat/mknodat02.c
+++ b/testcases/kernel/syscalls/mknodat/mknodat02.c
@@ -86,11 +86,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mlock/mlock01.c b/testcases/kernel/syscalls/mlock/mlock01.c
index d86bf64..5e01042 100644
--- a/testcases/kernel/syscalls/mlock/mlock01.c
+++ b/testcases/kernel/syscalls/mlock/mlock01.c
@@ -81,10 +81,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mlock/mlock02.c b/testcases/kernel/syscalls/mlock/mlock02.c
index c128d33..fe7db58 100644
--- a/testcases/kernel/syscalls/mlock/mlock02.c
+++ b/testcases/kernel/syscalls/mlock/mlock02.c
@@ -63,10 +63,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mlock/mlock03.c b/testcases/kernel/syscalls/mlock/mlock03.c
index 363c0c2..80600a2 100644
--- a/testcases/kernel/syscalls/mlock/mlock03.c
+++ b/testcases/kernel/syscalls/mlock/mlock03.c
@@ -49,14 +49,12 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
long from, to;
long first = -1, last = -1;
char b[KB];
FILE *fp;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mlockall/mlockall01.c b/testcases/kernel/syscalls/mlockall/mlockall01.c
index 201e967..dd51da7 100644
--- a/testcases/kernel/syscalls/mlockall/mlockall01.c
+++ b/testcases/kernel/syscalls/mlockall/mlockall01.c
@@ -93,11 +93,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mlockall/mlockall02.c b/testcases/kernel/syscalls/mlockall/mlockall02.c
index 5ab22b4..db2516c 100644
--- a/testcases/kernel/syscalls/mlockall/mlockall02.c
+++ b/testcases/kernel/syscalls/mlockall/mlockall02.c
@@ -103,11 +103,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mlockall/mlockall03.c b/testcases/kernel/syscalls/mlockall/mlockall03.c
index b2017da..29997c0 100644
--- a/testcases/kernel/syscalls/mlockall/mlockall03.c
+++ b/testcases/kernel/syscalls/mlockall/mlockall03.c
@@ -110,12 +110,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
struct utsname *buf;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/* allocate some space for buf */
if ((buf = malloc((size_t)sizeof(struct utsname))) == NULL) {
diff --git a/testcases/kernel/syscalls/mmap/mmap001.c b/testcases/kernel/syscalls/mmap/mmap001.c
index a915351..59a923f 100644
--- a/testcases/kernel/syscalls/mmap/mmap001.c
+++ b/testcases/kernel/syscalls/mmap/mmap001.c
@@ -81,13 +81,11 @@
int main(int argc, char *argv[])
{
char *array;
- const char *msg;
int i, lc;
int fd;
unsigned int pages, memsize;
- if ((msg = parse_opts(argc, argv, options, help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (m_opt) {
memsize = pages = atoi(m_copt);
diff --git a/testcases/kernel/syscalls/mmap/mmap01.c b/testcases/kernel/syscalls/mmap/mmap01.c
index e6b8e87..41183d1 100644
--- a/testcases/kernel/syscalls/mmap/mmap01.c
+++ b/testcases/kernel/syscalls/mmap/mmap01.c
@@ -66,10 +66,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap02.c b/testcases/kernel/syscalls/mmap/mmap02.c
index df6e84f..b7972f1 100644
--- a/testcases/kernel/syscalls/mmap/mmap02.c
+++ b/testcases/kernel/syscalls/mmap/mmap02.c
@@ -61,10 +61,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap03.c b/testcases/kernel/syscalls/mmap/mmap03.c
index 2447329..679f076 100644
--- a/testcases/kernel/syscalls/mmap/mmap03.c
+++ b/testcases/kernel/syscalls/mmap/mmap03.c
@@ -71,10 +71,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap04.c b/testcases/kernel/syscalls/mmap/mmap04.c
index 3c82040..896157b 100644
--- a/testcases/kernel/syscalls/mmap/mmap04.c
+++ b/testcases/kernel/syscalls/mmap/mmap04.c
@@ -65,10 +65,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap05.c b/testcases/kernel/syscalls/mmap/mmap05.c
index 8fdd2f3..2cbad06 100644
--- a/testcases/kernel/syscalls/mmap/mmap05.c
+++ b/testcases/kernel/syscalls/mmap/mmap05.c
@@ -67,11 +67,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char file_content;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap06.c b/testcases/kernel/syscalls/mmap/mmap06.c
index 534c60a..e01cef2 100644
--- a/testcases/kernel/syscalls/mmap/mmap06.c
+++ b/testcases/kernel/syscalls/mmap/mmap06.c
@@ -59,10 +59,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap07.c b/testcases/kernel/syscalls/mmap/mmap07.c
index b28e63a..372840a 100644
--- a/testcases/kernel/syscalls/mmap/mmap07.c
+++ b/testcases/kernel/syscalls/mmap/mmap07.c
@@ -60,10 +60,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap08.c b/testcases/kernel/syscalls/mmap/mmap08.c
index 326cffb..f7ef6c3 100644
--- a/testcases/kernel/syscalls/mmap/mmap08.c
+++ b/testcases/kernel/syscalls/mmap/mmap08.c
@@ -55,10 +55,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap09.c b/testcases/kernel/syscalls/mmap/mmap09.c
index ad4030b..4ab0da4 100644
--- a/testcases/kernel/syscalls/mmap/mmap09.c
+++ b/testcases/kernel/syscalls/mmap/mmap09.c
@@ -64,10 +64,8 @@
{
int lc;
int i;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap10.c b/testcases/kernel/syscalls/mmap/mmap10.c
index 144e53f..667cc80 100644
--- a/testcases/kernel/syscalls/mmap/mmap10.c
+++ b/testcases/kernel/syscalls/mmap/mmap10.c
@@ -88,11 +88,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (opt_ksm) {
if (access(PATH_KSM, F_OK) == -1)
diff --git a/testcases/kernel/syscalls/mmap/mmap11.c b/testcases/kernel/syscalls/mmap/mmap11.c
index 1b45ed1..a2d9945 100644
--- a/testcases/kernel/syscalls/mmap/mmap11.c
+++ b/testcases/kernel/syscalls/mmap/mmap11.c
@@ -68,11 +68,8 @@
int main(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
check();
cleanup();
diff --git a/testcases/kernel/syscalls/mmap/mmap12.c b/testcases/kernel/syscalls/mmap/mmap12.c
index f4ef38b..ba8c646 100644
--- a/testcases/kernel/syscalls/mmap/mmap12.c
+++ b/testcases/kernel/syscalls/mmap/mmap12.c
@@ -59,11 +59,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap13.c b/testcases/kernel/syscalls/mmap/mmap13.c
index 77f0bee..c5a2058 100644
--- a/testcases/kernel/syscalls/mmap/mmap13.c
+++ b/testcases/kernel/syscalls/mmap/mmap13.c
@@ -60,11 +60,8 @@
{
int lc;
char *ch;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap14.c b/testcases/kernel/syscalls/mmap/mmap14.c
index 41fafa6..65c6d79 100644
--- a/testcases/kernel/syscalls/mmap/mmap14.c
+++ b/testcases/kernel/syscalls/mmap/mmap14.c
@@ -46,14 +46,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
unsigned int sz_before;
unsigned int sz_after;
unsigned int sz_ch;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap15.c b/testcases/kernel/syscalls/mmap/mmap15.c
index 079ffc6..d2c0cbc 100644
--- a/testcases/kernel/syscalls/mmap/mmap15.c
+++ b/testcases/kernel/syscalls/mmap/mmap15.c
@@ -50,16 +50,13 @@
int main(int ac, char **av)
{
int lc, fd;
- const char *msg;
void *addr;
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "This test is only for 64bit");
#endif
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mmap/mmap16.c b/testcases/kernel/syscalls/mmap/mmap16.c
index 5fe8cb0..5291a35 100644
--- a/testcases/kernel/syscalls/mmap/mmap16.c
+++ b/testcases/kernel/syscalls/mmap/mmap16.c
@@ -58,11 +58,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
index ea091e6..2481118 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c
@@ -94,7 +94,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void *ptr;
int retval, func;
@@ -102,9 +101,7 @@
int flag;
int seg[4];
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
index da61574..b82d14e 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c
@@ -91,16 +91,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int val, pid, status;
int flag;
int seg[4];
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
index 5d6c3ea..01730e0 100644
--- a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
+++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c
@@ -50,11 +50,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mount/mount01.c b/testcases/kernel/syscalls/mount/mount01.c
index d8e0d2f..a7ced12 100644
--- a/testcases/kernel/syscalls/mount/mount01.c
+++ b/testcases/kernel/syscalls/mount/mount01.c
@@ -42,10 +42,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mount/mount02.c b/testcases/kernel/syscalls/mount/mount02.c
index cffcfdf..6dfd076 100644
--- a/testcases/kernel/syscalls/mount/mount02.c
+++ b/testcases/kernel/syscalls/mount/mount02.c
@@ -127,11 +127,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mount/mount03.c b/testcases/kernel/syscalls/mount/mount03.c
index cb10873..dc8eeee 100644
--- a/testcases/kernel/syscalls/mount/mount03.c
+++ b/testcases/kernel/syscalls/mount/mount03.c
@@ -83,11 +83,8 @@
int main(int argc, char *argv[])
{
int lc, i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mount/mount04.c b/testcases/kernel/syscalls/mount/mount04.c
index 7a48d48..6c9ebf7 100644
--- a/testcases/kernel/syscalls/mount/mount04.c
+++ b/testcases/kernel/syscalls/mount/mount04.c
@@ -67,10 +67,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)))
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mount/mount05.c b/testcases/kernel/syscalls/mount/mount05.c
index 710adb1..d19c147 100644
--- a/testcases/kernel/syscalls/mount/mount05.c
+++ b/testcases/kernel/syscalls/mount/mount05.c
@@ -59,11 +59,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &help);
setup();
diff --git a/testcases/kernel/syscalls/mount/mount06.c b/testcases/kernel/syscalls/mount/mount06.c
index 0d55d0a..d7dcec2 100644
--- a/testcases/kernel/syscalls/mount/mount06.c
+++ b/testcases/kernel/syscalls/mount/mount06.c
@@ -60,11 +60,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages01.c b/testcases/kernel/syscalls/move_pages/move_pages01.c
index 2893bb0..6f9bd89 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages01.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages01.c
@@ -67,13 +67,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages02.c b/testcases/kernel/syscalls/move_pages/move_pages02.c
index 07fbe96..23594ab 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages02.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages02.c
@@ -68,13 +68,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages03.c b/testcases/kernel/syscalls/move_pages/move_pages03.c
index 4d87c51..ec036e6 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages03.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages03.c
@@ -106,13 +106,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages04.c b/testcases/kernel/syscalls/move_pages/move_pages04.c
index 0ef377f..1657bee 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages04.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages04.c
@@ -74,13 +74,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages05.c b/testcases/kernel/syscalls/move_pages/move_pages05.c
index 2951464..10264ef 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages05.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages05.c
@@ -107,13 +107,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages06.c b/testcases/kernel/syscalls/move_pages/move_pages06.c
index 8f20283..847fc62 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages06.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages06.c
@@ -68,13 +68,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages07.c b/testcases/kernel/syscalls/move_pages/move_pages07.c
index 5c18f73..b8653bd 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages07.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages07.c
@@ -68,13 +68,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages08.c b/testcases/kernel/syscalls/move_pages/move_pages08.c
index 55ec255..e0705a2 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages08.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages08.c
@@ -68,11 +68,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages09.c b/testcases/kernel/syscalls/move_pages/move_pages09.c
index 43b9d25..d217fc2 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages09.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages09.c
@@ -68,11 +68,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages10.c b/testcases/kernel/syscalls/move_pages/move_pages10.c
index 8836a2c..1777ff4 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages10.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages10.c
@@ -68,13 +68,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/move_pages/move_pages11.c b/testcases/kernel/syscalls/move_pages/move_pages11.c
index ee0bf1a..4013c59 100644
--- a/testcases/kernel/syscalls/move_pages/move_pages11.c
+++ b/testcases/kernel/syscalls/move_pages/move_pages11.c
@@ -106,13 +106,8 @@
int main(int argc, char **argv)
{
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mprotect/mprotect01.c b/testcases/kernel/syscalls/mprotect/mprotect01.c
index 7a76482..d514b13 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect01.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect01.c
@@ -83,10 +83,8 @@
{
int lc;
int i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mprotect/mprotect02.c b/testcases/kernel/syscalls/mprotect/mprotect02.c
index 23d5611..a513493 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect02.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect02.c
@@ -58,13 +58,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int bytes_to_write, fd, num_bytes;
pid_t pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mprotect/mprotect03.c b/testcases/kernel/syscalls/mprotect/mprotect03.c
index c5cbcbb..c53932d 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect03.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect03.c
@@ -64,14 +64,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *addr;
int fd, pid;
char *buf = "abcdefghijklmnopqrstuvwxyz";
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c b/testcases/kernel/syscalls/mprotect/mprotect04.c
index aa3bf30..c4007f3 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect04.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect04.c
@@ -60,11 +60,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
index fb61650..4728c70 100644
--- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
+++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
@@ -299,7 +299,6 @@
int c;
int i;
int lc;
- const char *msg;
struct option long_options[] = {
{"debug", no_argument, 0, 'd'},
@@ -309,8 +308,7 @@
progname = basename(av[0]);
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify02.c b/testcases/kernel/syscalls/mq_notify/mq_notify02.c
index 874e746..fe59b5a 100644
--- a/testcases/kernel/syscalls/mq_notify/mq_notify02.c
+++ b/testcases/kernel/syscalls/mq_notify/mq_notify02.c
@@ -45,11 +45,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mq_open/mq_open01.c b/testcases/kernel/syscalls/mq_open/mq_open01.c
index cfd973c..3c2d1b1 100644
--- a/testcases/kernel/syscalls/mq_open/mq_open01.c
+++ b/testcases/kernel/syscalls/mq_open/mq_open01.c
@@ -393,10 +393,8 @@
int result = RESULT_OK;
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
index 2d0df22..945e2fa 100644
--- a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
+++ b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
@@ -437,10 +437,8 @@
int result = RESULT_OK;
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c b/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c
index aaaba61..5b1cd53 100644
--- a/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c
+++ b/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c
@@ -440,10 +440,8 @@
int result = RESULT_OK;
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c b/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
index 3ebc149..28b5696 100644
--- a/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
+++ b/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c
@@ -266,10 +266,8 @@
{
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c
index f6c15cb..d63d1e4 100644
--- a/testcases/kernel/syscalls/mremap/mremap01.c
+++ b/testcases/kernel/syscalls/mremap/mremap01.c
@@ -97,11 +97,9 @@
int main(int ac, char **av)
{
- const char *msg;
int ind; /* counter variable */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
tst_count = 0;
diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c
index 4c1e61b..5a51b9a 100644
--- a/testcases/kernel/syscalls/mremap/mremap02.c
+++ b/testcases/kernel/syscalls/mremap/mremap02.c
@@ -93,10 +93,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c
index 6b1827c..12e3829 100644
--- a/testcases/kernel/syscalls/mremap/mremap03.c
+++ b/testcases/kernel/syscalls/mremap/mremap03.c
@@ -95,10 +95,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mremap/mremap04.c b/testcases/kernel/syscalls/mremap/mremap04.c
index 748988a..c25dbfe 100644
--- a/testcases/kernel/syscalls/mremap/mremap04.c
+++ b/testcases/kernel/syscalls/mremap/mremap04.c
@@ -105,10 +105,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/mremap/mremap05.c b/testcases/kernel/syscalls/mremap/mremap05.c
index e612bf1..079f281 100644
--- a/testcases/kernel/syscalls/mremap/mremap05.c
+++ b/testcases/kernel/syscalls/mremap/mremap05.c
@@ -214,12 +214,9 @@
int main(int ac, char **av)
{
- const char *msg;
int lc, testno;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/msync/msync01.c b/testcases/kernel/syscalls/msync/msync01.c
index 6bd02c6..565d5fe 100644
--- a/testcases/kernel/syscalls/msync/msync01.c
+++ b/testcases/kernel/syscalls/msync/msync01.c
@@ -89,12 +89,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char read_buf[BUF_SIZE]; /* buffer to hold data read from file */
int nread = 0, count, err_flg = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/msync/msync03.c b/testcases/kernel/syscalls/msync/msync03.c
index c0a7ed9..8bd35be 100644
--- a/testcases/kernel/syscalls/msync/msync03.c
+++ b/testcases/kernel/syscalls/msync/msync03.c
@@ -87,11 +87,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/munlock/munlock01.c b/testcases/kernel/syscalls/munlock/munlock01.c
index 5e31e47..3b4392f 100644
--- a/testcases/kernel/syscalls/munlock/munlock01.c
+++ b/testcases/kernel/syscalls/munlock/munlock01.c
@@ -92,11 +92,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/munlock/munlock02.c b/testcases/kernel/syscalls/munlock/munlock02.c
index 9793f5f..75906a1 100644
--- a/testcases/kernel/syscalls/munlock/munlock02.c
+++ b/testcases/kernel/syscalls/munlock/munlock02.c
@@ -98,11 +98,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/munlockall/munlockall01.c b/testcases/kernel/syscalls/munlockall/munlockall01.c
index e8f7fbc..14d0667 100644
--- a/testcases/kernel/syscalls/munlockall/munlockall01.c
+++ b/testcases/kernel/syscalls/munlockall/munlockall01.c
@@ -76,12 +76,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/munlockall/munlockall02.c b/testcases/kernel/syscalls/munlockall/munlockall02.c
index 6570544..bc11371 100644
--- a/testcases/kernel/syscalls/munlockall/munlockall02.c
+++ b/testcases/kernel/syscalls/munlockall/munlockall02.c
@@ -85,12 +85,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/munmap/munmap01.c b/testcases/kernel/syscalls/munmap/munmap01.c
index e9510b7..62dbaff 100644
--- a/testcases/kernel/syscalls/munmap/munmap01.c
+++ b/testcases/kernel/syscalls/munmap/munmap01.c
@@ -92,10 +92,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/munmap/munmap02.c b/testcases/kernel/syscalls/munmap/munmap02.c
index 4752a8a..7f1d9f4 100644
--- a/testcases/kernel/syscalls/munmap/munmap02.c
+++ b/testcases/kernel/syscalls/munmap/munmap02.c
@@ -96,10 +96,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/munmap/munmap03.c b/testcases/kernel/syscalls/munmap/munmap03.c
index 88c1802..3b88b53 100644
--- a/testcases/kernel/syscalls/munmap/munmap03.c
+++ b/testcases/kernel/syscalls/munmap/munmap03.c
@@ -61,10 +61,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep01.c b/testcases/kernel/syscalls/nanosleep/nanosleep01.c
index 4809982..4d9d083 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep01.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep01.c
@@ -37,12 +37,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct timespec timereq = {.tv_sec = 2, .tv_nsec = 9999};
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep02.c b/testcases/kernel/syscalls/nanosleep/nanosleep02.c
index 9a26fd2..2da8937 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep02.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep02.c
@@ -59,11 +59,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t cpid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep03.c b/testcases/kernel/syscalls/nanosleep/nanosleep03.c
index c1cc394..2c9af6e 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep03.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep03.c
@@ -44,12 +44,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t cpid;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "dddd", &timereq.tv_sec, &timereq.tv_nsec,
diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep04.c b/testcases/kernel/syscalls/nanosleep/nanosleep04.c
index f3f253c..527ad14 100644
--- a/testcases/kernel/syscalls/nanosleep/nanosleep04.c
+++ b/testcases/kernel/syscalls/nanosleep/nanosleep04.c
@@ -65,10 +65,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/newuname/newuname01.c b/testcases/kernel/syscalls/newuname/newuname01.c
index 89f79d9..1c5cb48 100644
--- a/testcases/kernel/syscalls/newuname/newuname01.c
+++ b/testcases/kernel/syscalls/newuname/newuname01.c
@@ -107,11 +107,8 @@
{
struct utsname name;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nice/nice01.c b/testcases/kernel/syscalls/nice/nice01.c
index fd75ea5..fa6563d 100644
--- a/testcases/kernel/syscalls/nice/nice01.c
+++ b/testcases/kernel/syscalls/nice/nice01.c
@@ -88,12 +88,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int New_nice; /* priority of process after nice() */
int rval;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nice/nice02.c b/testcases/kernel/syscalls/nice/nice02.c
index a88a972..248c30b 100644
--- a/testcases/kernel/syscalls/nice/nice02.c
+++ b/testcases/kernel/syscalls/nice/nice02.c
@@ -82,12 +82,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int New_nice; /* priority of process after nice() */
int max_val; /* Maximum nice value per OS. */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nice/nice03.c b/testcases/kernel/syscalls/nice/nice03.c
index 7127073..357de9e 100644
--- a/testcases/kernel/syscalls/nice/nice03.c
+++ b/testcases/kernel/syscalls/nice/nice03.c
@@ -86,11 +86,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int New_nice; /* priority of process after nice() */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nice/nice04.c b/testcases/kernel/syscalls/nice/nice04.c
index 96b7ec3..40fa6ed 100644
--- a/testcases/kernel/syscalls/nice/nice04.c
+++ b/testcases/kernel/syscalls/nice/nice04.c
@@ -90,13 +90,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
int incr_val; /* nice value for the process */
char *test_desc; /* test specific error message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/nice/nice05.c b/testcases/kernel/syscalls/nice/nice05.c
index 750419f..699ec25 100644
--- a/testcases/kernel/syscalls/nice/nice05.c
+++ b/testcases/kernel/syscalls/nice/nice05.c
@@ -127,15 +127,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/open/open01.c b/testcases/kernel/syscalls/open/open01.c
index eb9f86b..adb59d4 100644
--- a/testcases/kernel/syscalls/open/open01.c
+++ b/testcases/kernel/syscalls/open/open01.c
@@ -66,7 +66,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct stat statbuf;
int fildes;
@@ -75,9 +74,7 @@
/*
* parse standard command line options
*/
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open02.c b/testcases/kernel/syscalls/open/open02.c
index 1b53210..5812d3c 100644
--- a/testcases/kernel/syscalls/open/open02.c
+++ b/testcases/kernel/syscalls/open/open02.c
@@ -58,12 +58,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open03.c b/testcases/kernel/syscalls/open/open03.c
index c0e7c71..a67873c 100644
--- a/testcases/kernel/syscalls/open/open03.c
+++ b/testcases/kernel/syscalls/open/open03.c
@@ -44,11 +44,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open04.c b/testcases/kernel/syscalls/open/open04.c
index 35c47d6..52a1e5c 100644
--- a/testcases/kernel/syscalls/open/open04.c
+++ b/testcases/kernel/syscalls/open/open04.c
@@ -49,11 +49,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open05.c b/testcases/kernel/syscalls/open/open05.c
index b17d8b6..43e6ef9 100644
--- a/testcases/kernel/syscalls/open/open05.c
+++ b/testcases/kernel/syscalls/open/open05.c
@@ -51,13 +51,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int e_code, status, retval = 0;
pid_t pid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open06.c b/testcases/kernel/syscalls/open/open06.c
index 0b3fde5..6c774ce 100644
--- a/testcases/kernel/syscalls/open/open06.c
+++ b/testcases/kernel/syscalls/open/open06.c
@@ -44,11 +44,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open07.c b/testcases/kernel/syscalls/open/open07.c
index eda8bf0..8d99ae5 100644
--- a/testcases/kernel/syscalls/open/open07.c
+++ b/testcases/kernel/syscalls/open/open07.c
@@ -103,12 +103,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open08.c b/testcases/kernel/syscalls/open/open08.c
index d5ce59a..4a3fa25 100644
--- a/testcases/kernel/syscalls/open/open08.c
+++ b/testcases/kernel/syscalls/open/open08.c
@@ -92,12 +92,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open09.c b/testcases/kernel/syscalls/open/open09.c
index da14cdf..331ce0f 100644
--- a/testcases/kernel/syscalls/open/open09.c
+++ b/testcases/kernel/syscalls/open/open09.c
@@ -47,11 +47,8 @@
char pbuf[BUFSIZ];
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open10.c b/testcases/kernel/syscalls/open/open10.c
index a8f9812..31f4679 100644
--- a/testcases/kernel/syscalls/open/open10.c
+++ b/testcases/kernel/syscalls/open/open10.c
@@ -76,12 +76,9 @@
pid_t mypid;
int lc;
- const char *msg;
int fail_count = 0;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open11.c b/testcases/kernel/syscalls/open/open11.c
index a04c834..9e6bb34 100644
--- a/testcases/kernel/syscalls/open/open11.c
+++ b/testcases/kernel/syscalls/open/open11.c
@@ -331,11 +331,8 @@
int i;
int fd;
int ret;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/open/open12.c b/testcases/kernel/syscalls/open/open12.c
index 2d90bac..54ddfe0 100644
--- a/testcases/kernel/syscalls/open/open12.c
+++ b/testcases/kernel/syscalls/open/open12.c
@@ -51,12 +51,9 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
index 57a7369..85f9a91 100644
--- a/testcases/kernel/syscalls/openat/openat01.c
+++ b/testcases/kernel/syscalls/openat/openat01.c
@@ -97,11 +97,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/openat/openat02.c b/testcases/kernel/syscalls/openat/openat02.c
index f1d8a4a..580b086 100644
--- a/testcases/kernel/syscalls/openat/openat02.c
+++ b/testcases/kernel/syscalls/openat/openat02.c
@@ -85,11 +85,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pathconf/pathconf01.c b/testcases/kernel/syscalls/pathconf/pathconf01.c
index f88c096..ddbe87f 100644
--- a/testcases/kernel/syscalls/pathconf/pathconf01.c
+++ b/testcases/kernel/syscalls/pathconf/pathconf01.c
@@ -150,14 +150,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
-
- /***************************************************************
- * parse standard options
- ***************************************************************/
- if ((msg = parse_opts(ac, av, options, &help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, &help);
if (!lflag) {
path = strdup("/tmp");
diff --git a/testcases/kernel/syscalls/pause/pause01.c b/testcases/kernel/syscalls/pause/pause01.c
index 8b37e08..c967d8e 100644
--- a/testcases/kernel/syscalls/pause/pause01.c
+++ b/testcases/kernel/syscalls/pause/pause01.c
@@ -46,14 +46,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct itimerval it = {
.it_interval = {.tv_sec = 0, .tv_usec = 0},
.it_value = {.tv_sec = 0, .tv_usec = 1000},
};
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pause/pause02.c b/testcases/kernel/syscalls/pause/pause02.c
index 7b1abbe..0e862a1 100644
--- a/testcases/kernel/syscalls/pause/pause02.c
+++ b/testcases/kernel/syscalls/pause/pause02.c
@@ -41,11 +41,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/pause/pause03.c b/testcases/kernel/syscalls/pause/pause03.c
index 31d92da..f3565e3 100644
--- a/testcases/kernel/syscalls/pause/pause03.c
+++ b/testcases/kernel/syscalls/pause/pause03.c
@@ -41,11 +41,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c b/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c
index e4027ed..9c87e65 100644
--- a/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c
+++ b/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c
@@ -81,11 +81,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c b/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c
index 40e13e8..5dc205b 100644
--- a/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c
+++ b/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c
@@ -100,11 +100,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, options, help);
setup();
diff --git a/testcases/kernel/syscalls/personality/personality01.c b/testcases/kernel/syscalls/personality/personality01.c
index 670df7f..9e92eba 100644
--- a/testcases/kernel/syscalls/personality/personality01.c
+++ b/testcases/kernel/syscalls/personality/personality01.c
@@ -76,11 +76,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i, start_pers;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/personality/personality02.c b/testcases/kernel/syscalls/personality/personality02.c
index 708e12d..83698b0 100644
--- a/testcases/kernel/syscalls/personality/personality02.c
+++ b/testcases/kernel/syscalls/personality/personality02.c
@@ -81,11 +81,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int start_pers;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/pipe/pipe01.c b/testcases/kernel/syscalls/pipe/pipe01.c
index 26c644b..d4eb08e 100644
--- a/testcases/kernel/syscalls/pipe/pipe01.c
+++ b/testcases/kernel/syscalls/pipe/pipe01.c
@@ -68,15 +68,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fildes[2]; /* fds for pipe read and write */
char wrbuf[BUFSIZ], rebuf[BUFSIZ];
int red, written; /* no. of chars read/written to pipe */
int greater, length;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe02.c b/testcases/kernel/syscalls/pipe/pipe02.c
index e2582f2..317634a 100644
--- a/testcases/kernel/syscalls/pipe/pipe02.c
+++ b/testcases/kernel/syscalls/pipe/pipe02.c
@@ -80,16 +80,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char rbuf[BUFSIZ], wbuf[BUFSIZ];
int pid, ret, len, rlen, status;
int sig = 0;
usrsig = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "dd", &pp[0], &pp[1]);
#endif
diff --git a/testcases/kernel/syscalls/pipe/pipe03.c b/testcases/kernel/syscalls/pipe/pipe03.c
index 73bcdaa..e95e376 100644
--- a/testcases/kernel/syscalls/pipe/pipe03.c
+++ b/testcases/kernel/syscalls/pipe/pipe03.c
@@ -66,13 +66,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fildes[2]; /* fds for pipe read and write */
char rbuf[BUFSIZ];
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe04.c b/testcases/kernel/syscalls/pipe/pipe04.c
index 13cdabb..66eda49 100644
--- a/testcases/kernel/syscalls/pipe/pipe04.c
+++ b/testcases/kernel/syscalls/pipe/pipe04.c
@@ -75,7 +75,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t c1pid, c2pid;
int wtstatus;
int bytesread;
@@ -83,8 +82,7 @@
char rbuf[BUFSIZ];
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&c1func, "ndd", 1, &fildes[0], &fildes[1]);
maybe_run_child(&c2func, "ndd", 2, &fildes[0], &fildes[1]);
diff --git a/testcases/kernel/syscalls/pipe/pipe05.c b/testcases/kernel/syscalls/pipe/pipe05.c
index e5fdf67..fe5ec37 100644
--- a/testcases/kernel/syscalls/pipe/pipe05.c
+++ b/testcases/kernel/syscalls/pipe/pipe05.c
@@ -60,11 +60,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct sigaction sa, osa;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe06.c b/testcases/kernel/syscalls/pipe/pipe06.c
index a7f0b70..d837656 100644
--- a/testcases/kernel/syscalls/pipe/pipe06.c
+++ b/testcases/kernel/syscalls/pipe/pipe06.c
@@ -57,10 +57,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe07.c b/testcases/kernel/syscalls/pipe/pipe07.c
index bf2a7ad..b09df71 100644
--- a/testcases/kernel/syscalls/pipe/pipe07.c
+++ b/testcases/kernel/syscalls/pipe/pipe07.c
@@ -55,13 +55,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int min, ret;
int npipes;
int pipes[2], max_fd = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe08.c b/testcases/kernel/syscalls/pipe/pipe08.c
index 4519860..cdb2a4d 100644
--- a/testcases/kernel/syscalls/pipe/pipe08.c
+++ b/testcases/kernel/syscalls/pipe/pipe08.c
@@ -63,15 +63,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int pipefd[2]; /* fds for pipe read/write */
char wrbuf[BUFSIZ];
int written, length;
int close_stat; /* exit status of close(read fd) */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe09.c b/testcases/kernel/syscalls/pipe/pipe09.c
index 006d029..db5adcd 100644
--- a/testcases/kernel/syscalls/pipe/pipe09.c
+++ b/testcases/kernel/syscalls/pipe/pipe09.c
@@ -74,7 +74,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i, red, wtstatus;
int pipefd[2]; /* fds for pipe read/write */
@@ -82,8 +81,7 @@
int Acnt = 0, Bcnt = 0; /* count 'A' and 'B' */
int fork_1, fork_2; /* ret values in parent */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe10.c b/testcases/kernel/syscalls/pipe/pipe10.c
index dd48495..542cde0 100644
--- a/testcases/kernel/syscalls/pipe/pipe10.c
+++ b/testcases/kernel/syscalls/pipe/pipe10.c
@@ -69,7 +69,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int fd[2]; /* fds for pipe read/write */
char wrbuf[BUFSIZ], rebuf[BUFSIZ];
@@ -78,8 +77,7 @@
int length, greater, forkstat;
int retval = 0, status, e_code;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pipe/pipe11.c b/testcases/kernel/syscalls/pipe/pipe11.c
index 32d882f..5acda22 100644
--- a/testcases/kernel/syscalls/pipe/pipe11.c
+++ b/testcases/kernel/syscalls/pipe/pipe11.c
@@ -87,15 +87,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
int fork_ret, status;
int written; /* no of chars read and written */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "ddddd", &fd[0], &fd[1], &kidid,
&ncperchild, &szcharbuf);
diff --git a/testcases/kernel/syscalls/pipe2/pipe2_01.c b/testcases/kernel/syscalls/pipe2/pipe2_01.c
index c501ff8..38d257f 100644
--- a/testcases/kernel/syscalls/pipe2/pipe2_01.c
+++ b/testcases/kernel/syscalls/pipe2/pipe2_01.c
@@ -130,12 +130,8 @@
{
int fd[2], i, coe;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/pipe2/pipe2_02.c b/testcases/kernel/syscalls/pipe2/pipe2_02.c
index 87bc1ae..e130f40 100644
--- a/testcases/kernel/syscalls/pipe2/pipe2_02.c
+++ b/testcases/kernel/syscalls/pipe2/pipe2_02.c
@@ -121,12 +121,8 @@
{
int fds[2], fl, i;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/poll/poll01.c b/testcases/kernel/syscalls/poll/poll01.c
index a442a27..c641f52 100644
--- a/testcases/kernel/syscalls/poll/poll01.c
+++ b/testcases/kernel/syscalls/poll/poll01.c
@@ -95,10 +95,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/poll/poll02.c b/testcases/kernel/syscalls/poll/poll02.c
index eefed00..98e7e2a 100644
--- a/testcases/kernel/syscalls/poll/poll02.c
+++ b/testcases/kernel/syscalls/poll/poll02.c
@@ -43,14 +43,12 @@
int main(int ac, char **av)
{
int lc, treshold;
- const char *msg;
long long elapsed_ms, sleep_ms = 100;
struct pollfd fds[] = {
{.fd = 1, .events = POLLIN}
};
- if ((msg = parse_opts(ac, av, opts, help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, opts, help);
if (opt_sleep_ms) {
sleep_ms = atoll(opt_sleep_ms);
diff --git a/testcases/kernel/syscalls/prctl/prctl01.c b/testcases/kernel/syscalls/prctl/prctl01.c
index ccd1c6c..1857dfb 100644
--- a/testcases/kernel/syscalls/prctl/prctl01.c
+++ b/testcases/kernel/syscalls/prctl/prctl01.c
@@ -92,12 +92,10 @@
{
int lc, i;
- const char *msg;
pid_t child_pid;
int status, sig;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/prctl/prctl02.c b/testcases/kernel/syscalls/prctl/prctl02.c
index e9d8c8b..67e3b6f 100644
--- a/testcases/kernel/syscalls/prctl/prctl02.c
+++ b/testcases/kernel/syscalls/prctl/prctl02.c
@@ -106,12 +106,10 @@
{
int lc, i;
- const char *msg;
pid_t child_pid;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pread/pread01.c b/testcases/kernel/syscalls/pread/pread01.c
index cde97f7..94c9d94 100644
--- a/testcases/kernel/syscalls/pread/pread01.c
+++ b/testcases/kernel/syscalls/pread/pread01.c
@@ -100,11 +100,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int nread; /* no. of bytes read by pread() */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pread/pread02.c b/testcases/kernel/syscalls/pread/pread02.c
index b0431f9..b973977 100644
--- a/testcases/kernel/syscalls/pread/pread02.c
+++ b/testcases/kernel/syscalls/pread/pread02.c
@@ -109,15 +109,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
int fildes; /* file descriptor of test file */
size_t nbytes; /* no. of bytes to be written */
off_t offset; /* offset position in the specified file */
char *test_desc; /* test specific error message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pread/pread03.c b/testcases/kernel/syscalls/pread/pread03.c
index 21916c8..f56b22f 100644
--- a/testcases/kernel/syscalls/pread/pread03.c
+++ b/testcases/kernel/syscalls/pread/pread03.c
@@ -98,13 +98,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
size_t nbytes; /* no. of bytes to be written */
off_t offset; /* offset position in the specified file */
char *test_desc; /* test specific error message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/profil/profil01.c b/testcases/kernel/syscalls/profil/profil01.c
index 37106fc..2fc47aa 100644
--- a/testcases/kernel/syscalls/profil/profil01.c
+++ b/testcases/kernel/syscalls/profil/profil01.c
@@ -116,11 +116,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++)
test_profil();
diff --git a/testcases/kernel/syscalls/pselect/pselect01.c b/testcases/kernel/syscalls/pselect/pselect01.c
index c16834a..21f02db 100644
--- a/testcases/kernel/syscalls/pselect/pselect01.c
+++ b/testcases/kernel/syscalls/pselect/pselect01.c
@@ -129,12 +129,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pselect/pselect02.c b/testcases/kernel/syscalls/pselect/pselect02.c
index f6c444d..d31621d 100644
--- a/testcases/kernel/syscalls/pselect/pselect02.c
+++ b/testcases/kernel/syscalls/pselect/pselect02.c
@@ -56,12 +56,9 @@
int main(int argc, char **argv)
{
- const char *msg;
int lc, i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c
index 94f5919..5a7ed5f 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace01.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace01.c
@@ -113,13 +113,11 @@
{
int lc;
- const char *msg;
pid_t child_pid;
int status;
struct sigaction parent_act;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "d", &i);
#endif
diff --git a/testcases/kernel/syscalls/ptrace/ptrace02.c b/testcases/kernel/syscalls/ptrace/ptrace02.c
index 1dbfcf0..057591f 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace02.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace02.c
@@ -113,13 +113,11 @@
{
int lc;
- const char *msg;
pid_t child_pid;
int status;
struct sigaction parent_act;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "d", &i);
#endif
diff --git a/testcases/kernel/syscalls/ptrace/ptrace03.c b/testcases/kernel/syscalls/ptrace/ptrace03.c
index c4375ac..a4028fc 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace03.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace03.c
@@ -117,12 +117,10 @@
{
int lc, i;
- const char *msg;
pid_t child_pid;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ptrace/ptrace04.c b/testcases/kernel/syscalls/ptrace/ptrace04.c
index b29e3da..b2707c0 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace04.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace04.c
@@ -99,13 +99,10 @@
int main(int argc, char *argv[])
{
- const char *msg;
-
if (ARRAY_SIZE(regs) == 0)
tst_brkm(TCONF, NULL, "test not supported for your arch (yet)");
- if ((msg = parse_opts(argc, argv, NULL, NULL)))
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
make_a_baby(argc, argv);
diff --git a/testcases/kernel/syscalls/ptrace/ptrace06.c b/testcases/kernel/syscalls/ptrace/ptrace06.c
index 8f2b9ce..ba92ed1 100644
--- a/testcases/kernel/syscalls/ptrace/ptrace06.c
+++ b/testcases/kernel/syscalls/ptrace/ptrace06.c
@@ -166,10 +166,8 @@
size_t i;
long ret;
int saved_errno;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)))
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
make_a_baby(argc, argv);
diff --git a/testcases/kernel/syscalls/pwrite/pwrite01.c b/testcases/kernel/syscalls/pwrite/pwrite01.c
index 9e1b49a..2d00fb1 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite01.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite01.c
@@ -101,11 +101,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int nwrite; /* no. of bytes written by pwrite() */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pwrite/pwrite02.c b/testcases/kernel/syscalls/pwrite/pwrite02.c
index 865042a..d4592fb 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite02.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite02.c
@@ -71,10 +71,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/pwrite/pwrite04.c b/testcases/kernel/syscalls/pwrite/pwrite04.c
index 300ba58..b297682 100644
--- a/testcases/kernel/syscalls/pwrite/pwrite04.c
+++ b/testcases/kernel/syscalls/pwrite/pwrite04.c
@@ -70,18 +70,12 @@
char *wbuf[NBUFS];
struct stat statbuf;
int lc;
- const char *msg;
strcpy(name, DATA_FILE);
sprintf(fname, "%s.%d", name, getpid());
- /*
- * parse standard options
- */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
- }
tst_tmpdir();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/quotactl/quotactl01.c b/testcases/kernel/syscalls/quotactl/quotactl01.c
index 3f6564f..de49d84 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl01.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl01.c
@@ -215,11 +215,8 @@
int ret;
int i;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, (option_t *) opts, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, (option_t *) opts, NULL);
setup();
diff --git a/testcases/kernel/syscalls/quotactl/quotactl02.c b/testcases/kernel/syscalls/quotactl/quotactl02.c
index 18aecac..01ed7f6 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl02.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl02.c
@@ -84,11 +84,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/read/read01.c b/testcases/kernel/syscalls/read/read01.c
index a6b07a5..839819a 100644
--- a/testcases/kernel/syscalls/read/read01.c
+++ b/testcases/kernel/syscalls/read/read01.c
@@ -140,13 +140,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/read/read02.c b/testcases/kernel/syscalls/read/read02.c
index 63ae3ab..650e2cd 100644
--- a/testcases/kernel/syscalls/read/read02.c
+++ b/testcases/kernel/syscalls/read/read02.c
@@ -85,11 +85,8 @@
{
int i;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/read/read03.c b/testcases/kernel/syscalls/read/read03.c
index dd01944..e8b3bbd 100644
--- a/testcases/kernel/syscalls/read/read03.c
+++ b/testcases/kernel/syscalls/read/read03.c
@@ -64,13 +64,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int c;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/read/read04.c b/testcases/kernel/syscalls/read/read04.c
index 9a2fdd2..aa9a7bf 100644
--- a/testcases/kernel/syscalls/read/read04.c
+++ b/testcases/kernel/syscalls/read/read04.c
@@ -66,7 +66,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int rfild;
char prbuf[BUFSIZ];
@@ -74,9 +73,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup for test */
diff --git a/testcases/kernel/syscalls/readahead/readahead01.c b/testcases/kernel/syscalls/readahead/readahead01.c
index 8a8f83d..a8b0a5a 100644
--- a/testcases/kernel/syscalls/readahead/readahead01.c
+++ b/testcases/kernel/syscalls/readahead/readahead01.c
@@ -128,12 +128,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, options, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/readahead/readahead02.c b/testcases/kernel/syscalls/readahead/readahead02.c
index f1571c4..2b9010b 100644
--- a/testcases/kernel/syscalls/readahead/readahead02.c
+++ b/testcases/kernel/syscalls/readahead/readahead02.c
@@ -330,12 +330,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (opt_fsize)
testfile_size = atoi(opt_fsizestr);
diff --git a/testcases/kernel/syscalls/readdir/readdir01.c b/testcases/kernel/syscalls/readdir/readdir01.c
index 7bce1d3..15b1b27 100644
--- a/testcases/kernel/syscalls/readdir/readdir01.c
+++ b/testcases/kernel/syscalls/readdir/readdir01.c
@@ -134,17 +134,9 @@
char Fname[255];
int Nfiles = 0;
-/* To add command line options you need to declare a structure to pass to
- * parse_opts(). options is the structure used in this example. The format is
- * the string that should be added to optstring in getopt(3), an integer that
- * will be used as a flag if the option is given, and a pointer to a string that
- * should receive the optarg parameter from getopt(3). Here we add a -N
- * option. Long options are not supported at this time.
- */
char *Nfilearg;
int Nflag = 0;
-/* for test specific parse_opts options */
option_t options[] = {
{"N:", &Nflag, &Nfilearg}, /* -N #files */
{NULL, NULL, NULL}
@@ -156,23 +148,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int cnt;
int nfiles, fd;
char fname[255];
DIR *test_dir;
struct dirent *dptr;
- /***************************************************************
- * parse standard options
- ***************************************************************/
- /* start off by parsing the command line options. We provide a function
- * that understands many common options to control looping. If you are not
- * adding any new options, pass NULL in place of options and &help.
- */
- if ((msg = parse_opts(ac, av, options, &help)) != 0) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, options, &help);
if (Nflag) {
if (sscanf(Nfilearg, "%i", &Nfiles) != 1) {
diff --git a/testcases/kernel/syscalls/readdir/readdir02.c b/testcases/kernel/syscalls/readdir/readdir02.c
index a4cba9c..3f3151f 100644
--- a/testcases/kernel/syscalls/readdir/readdir02.c
+++ b/testcases/kernel/syscalls/readdir/readdir02.c
@@ -63,12 +63,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
DIR *test_dir;
struct dirent *dptr;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readdir/readdir21.c b/testcases/kernel/syscalls/readdir/readdir21.c
index 0d42fa8..ced8fa7 100644
--- a/testcases/kernel/syscalls/readdir/readdir21.c
+++ b/testcases/kernel/syscalls/readdir/readdir21.c
@@ -79,11 +79,8 @@
int main(int argc, char **argv)
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readlink/readlink01.c b/testcases/kernel/syscalls/readlink/readlink01.c
index 468f7cf..cc27bb5 100644
--- a/testcases/kernel/syscalls/readlink/readlink01.c
+++ b/testcases/kernel/syscalls/readlink/readlink01.c
@@ -93,10 +93,8 @@
{
char buffer[MAX_SIZE]; /* temporary buffer to hold symlink contents */
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readlink/readlink02.c b/testcases/kernel/syscalls/readlink/readlink02.c
index 1db4df7..c73fc67 100644
--- a/testcases/kernel/syscalls/readlink/readlink02.c
+++ b/testcases/kernel/syscalls/readlink/readlink02.c
@@ -128,13 +128,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/readlink/readlink03.c b/testcases/kernel/syscalls/readlink/readlink03.c
index ed4f240..24ed078 100644
--- a/testcases/kernel/syscalls/readlink/readlink03.c
+++ b/testcases/kernel/syscalls/readlink/readlink03.c
@@ -96,11 +96,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readlink/readlink04.c b/testcases/kernel/syscalls/readlink/readlink04.c
index 71e760c..52dbd71 100644
--- a/testcases/kernel/syscalls/readlink/readlink04.c
+++ b/testcases/kernel/syscalls/readlink/readlink04.c
@@ -57,10 +57,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
index 9a7c3ae..97a49e8 100644
--- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
@@ -102,11 +102,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat02.c b/testcases/kernel/syscalls/readlinkat/readlinkat02.c
index 68e1239..10b8d5b 100644
--- a/testcases/kernel/syscalls/readlinkat/readlinkat02.c
+++ b/testcases/kernel/syscalls/readlinkat/readlinkat02.c
@@ -64,11 +64,8 @@
int main(int argc, char **argv)
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readv/readv01.c b/testcases/kernel/syscalls/readv/readv01.c
index bbf2913..d540a2e 100644
--- a/testcases/kernel/syscalls/readv/readv01.c
+++ b/testcases/kernel/syscalls/readv/readv01.c
@@ -57,11 +57,9 @@
int main(int ac, char **av)
{
int lc, i, fail;
- const char *msg;
char *vec;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readv/readv02.c b/testcases/kernel/syscalls/readv/readv02.c
index 50459ff..b5f826c 100644
--- a/testcases/kernel/syscalls/readv/readv02.c
+++ b/testcases/kernel/syscalls/readv/readv02.c
@@ -101,11 +101,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/readv/readv03.c b/testcases/kernel/syscalls/readv/readv03.c
index ca0e0e1..79aebe0 100644
--- a/testcases/kernel/syscalls/readv/readv03.c
+++ b/testcases/kernel/syscalls/readv/readv03.c
@@ -78,11 +78,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/reboot/reboot01.c b/testcases/kernel/syscalls/reboot/reboot01.c
index 1b75e34..13b9e19 100644
--- a/testcases/kernel/syscalls/reboot/reboot01.c
+++ b/testcases/kernel/syscalls/reboot/reboot01.c
@@ -91,10 +91,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/reboot/reboot02.c b/testcases/kernel/syscalls/reboot/reboot02.c
index 43e6f7f..cbe0b15 100644
--- a/testcases/kernel/syscalls/reboot/reboot02.c
+++ b/testcases/kernel/syscalls/reboot/reboot02.c
@@ -104,10 +104,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/recv/recv01.c b/testcases/kernel/syscalls/recv/recv01.c
index 34e7bbb..9c21dc2 100644
--- a/testcases/kernel/syscalls/recv/recv01.c
+++ b/testcases/kernel/syscalls/recv/recv01.c
@@ -111,10 +111,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
maybe_run_child(&do_child, "d", &sfd);
diff --git a/testcases/kernel/syscalls/recvfrom/recvfrom01.c b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
index c74eeec..3bcf2a1 100644
--- a/testcases/kernel/syscalls/recvfrom/recvfrom01.c
+++ b/testcases/kernel/syscalls/recvfrom/recvfrom01.c
@@ -132,10 +132,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/recvmsg/recvmsg01.c b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
index 6479660..13bd58f 100644
--- a/testcases/kernel/syscalls/recvmsg/recvmsg01.c
+++ b/testcases/kernel/syscalls/recvmsg/recvmsg01.c
@@ -188,10 +188,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
maybe_run_child(&do_child, "dd", &sfd, &ufd);
diff --git a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
index 7fad17a..86496c1 100644
--- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
+++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c
@@ -112,7 +112,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
#if defined (__s390__) || (__s390x__) || (__ia64__)
/* Disables the test in case the kernel version is lower than 2.6.12 and arch is s390 */
@@ -123,9 +122,7 @@
}
#endif
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
index 6064d6c..ddd537e 100644
--- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
+++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c
@@ -131,7 +131,6 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
#if defined (__s390__) || (__s390x__) || (__ia64__)
/* Disables the test in case the kernel version is lower than 2.6.12 and arch is s390 */
@@ -142,8 +141,7 @@
}
#endif
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rename/rename01.c b/testcases/kernel/syscalls/rename/rename01.c
index f819d6c..a1e3f96 100644
--- a/testcases/kernel/syscalls/rename/rename01.c
+++ b/testcases/kernel/syscalls/rename/rename01.c
@@ -103,14 +103,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename02.c b/testcases/kernel/syscalls/rename/rename02.c
index a24e35b..304d530 100644
--- a/testcases/kernel/syscalls/rename/rename02.c
+++ b/testcases/kernel/syscalls/rename/rename02.c
@@ -128,10 +128,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rename/rename03.c b/testcases/kernel/syscalls/rename/rename03.c
index 733f21e..9040deb 100644
--- a/testcases/kernel/syscalls/rename/rename03.c
+++ b/testcases/kernel/syscalls/rename/rename03.c
@@ -98,14 +98,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
*/
diff --git a/testcases/kernel/syscalls/rename/rename04.c b/testcases/kernel/syscalls/rename/rename04.c
index 67fe0df..f3d6066 100644
--- a/testcases/kernel/syscalls/rename/rename04.c
+++ b/testcases/kernel/syscalls/rename/rename04.c
@@ -81,13 +81,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename05.c b/testcases/kernel/syscalls/rename/rename05.c
index 7056b00..6302ae5 100644
--- a/testcases/kernel/syscalls/rename/rename05.c
+++ b/testcases/kernel/syscalls/rename/rename05.c
@@ -78,13 +78,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename06.c b/testcases/kernel/syscalls/rename/rename06.c
index 4cda217..941782c 100644
--- a/testcases/kernel/syscalls/rename/rename06.c
+++ b/testcases/kernel/syscalls/rename/rename06.c
@@ -80,13 +80,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename07.c b/testcases/kernel/syscalls/rename/rename07.c
index 5cd8243..6494967 100644
--- a/testcases/kernel/syscalls/rename/rename07.c
+++ b/testcases/kernel/syscalls/rename/rename07.c
@@ -61,13 +61,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename08.c b/testcases/kernel/syscalls/rename/rename08.c
index b117934..de2c035 100644
--- a/testcases/kernel/syscalls/rename/rename08.c
+++ b/testcases/kernel/syscalls/rename/rename08.c
@@ -105,14 +105,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rename/rename09.c b/testcases/kernel/syscalls/rename/rename09.c
index 05d89d2..942b9b4 100644
--- a/testcases/kernel/syscalls/rename/rename09.c
+++ b/testcases/kernel/syscalls/rename/rename09.c
@@ -96,7 +96,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int rval;
pid_t pid, pid1;
int status;
@@ -104,8 +103,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename10.c b/testcases/kernel/syscalls/rename/rename10.c
index d3d125f..4b656b0 100644
--- a/testcases/kernel/syscalls/rename/rename10.c
+++ b/testcases/kernel/syscalls/rename/rename10.c
@@ -95,14 +95,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename11.c b/testcases/kernel/syscalls/rename/rename11.c
index 5806ab3..4459ef5 100644
--- a/testcases/kernel/syscalls/rename/rename11.c
+++ b/testcases/kernel/syscalls/rename/rename11.c
@@ -70,11 +70,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rename/rename12.c b/testcases/kernel/syscalls/rename/rename12.c
index 1e080e4..d42c138 100644
--- a/testcases/kernel/syscalls/rename/rename12.c
+++ b/testcases/kernel/syscalls/rename/rename12.c
@@ -92,15 +92,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int status;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename13.c b/testcases/kernel/syscalls/rename/rename13.c
index d51599d..7a791f0 100644
--- a/testcases/kernel/syscalls/rename/rename13.c
+++ b/testcases/kernel/syscalls/rename/rename13.c
@@ -81,13 +81,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rename/rename14.c b/testcases/kernel/syscalls/rename/rename14.c
index 90231d4..0d821ba 100644
--- a/testcases/kernel/syscalls/rename/rename14.c
+++ b/testcases/kernel/syscalls/rename/rename14.c
@@ -71,10 +71,8 @@
void dochild2();
#ifdef UCLINUX
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
maybe_run_child(&dochild1, "n", 1);
maybe_run_child(&dochild2, "n", 2);
diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
index ea84e8a..0d008ee 100644
--- a/testcases/kernel/syscalls/renameat/renameat01.c
+++ b/testcases/kernel/syscalls/renameat/renameat01.c
@@ -113,11 +113,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rmdir/rmdir01.c b/testcases/kernel/syscalls/rmdir/rmdir01.c
index 6d1bd21..f7e176a 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir01.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir01.c
@@ -77,15 +77,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct stat buf;
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rmdir/rmdir02.c b/testcases/kernel/syscalls/rmdir/rmdir02.c
index 9582702..889d181 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir02.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir02.c
@@ -102,11 +102,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rmdir/rmdir03.c b/testcases/kernel/syscalls/rmdir/rmdir03.c
index daa937d..cca9690 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir03.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir03.c
@@ -95,7 +95,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
struct stat buf1;
int e_code, status, status2;
@@ -103,9 +102,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&dochild1, "ns", 1, tstdir2);
maybe_run_child(&dochild2, "ns", 2, tstdir4);
diff --git a/testcases/kernel/syscalls/rmdir/rmdir04.c b/testcases/kernel/syscalls/rmdir/rmdir04.c
index 4959a27..1b32daf 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir04.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir04.c
@@ -131,13 +131,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/rmdir/rmdir05.c b/testcases/kernel/syscalls/rmdir/rmdir05.c
index af6dab3..10037c7 100644
--- a/testcases/kernel/syscalls/rmdir/rmdir05.c
+++ b/testcases/kernel/syscalls/rmdir/rmdir05.c
@@ -66,10 +66,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
index 4cee988..9ca914f 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
@@ -85,11 +85,8 @@
unsigned int flag;
int signal;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
index 4f7abb0..7c0f0d0 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
@@ -73,11 +73,8 @@
unsigned int flag;
int signal;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
index 8db912f..5206c16 100644
--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
@@ -98,11 +98,8 @@
unsigned int flag;
int signal;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
index d6224d8..74e5a61 100644
--- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
+++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c
@@ -80,11 +80,8 @@
sigset_t set, oset;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
index f7d84c3..cbc4f7e 100644
--- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
+++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c
@@ -91,11 +91,8 @@
{
int i;
sigset_t s;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
index 4116820..95b5827 100644
--- a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
+++ b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c
@@ -53,11 +53,8 @@
{
sigset_t set, set1, set2;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sbrk/sbrk01.c b/testcases/kernel/syscalls/sbrk/sbrk01.c
index 1853521..ce26b15 100644
--- a/testcases/kernel/syscalls/sbrk/sbrk01.c
+++ b/testcases/kernel/syscalls/sbrk/sbrk01.c
@@ -64,12 +64,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sbrk/sbrk02.c b/testcases/kernel/syscalls/sbrk/sbrk02.c
index b7e4de3..84744ef 100644
--- a/testcases/kernel/syscalls/sbrk/sbrk02.c
+++ b/testcases/kernel/syscalls/sbrk/sbrk02.c
@@ -38,11 +38,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
index 62dccbf..0ea06bb 100644
--- a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
+++ b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c
@@ -88,11 +88,9 @@
int main(int ac, char **av)
{
- int lc, ind; /* loop counter */
- const char *msg;
+ int lc, ind;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
index b2982b6..63b0d8a 100644
--- a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
+++ b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c
@@ -81,10 +81,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
index 2c2c922..b3c2709 100644
--- a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
+++ b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c
@@ -88,11 +88,9 @@
int main(int ac, char **av)
{
- int lc, ind; /* loop counter */
- const char *msg;
+ int lc, ind;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
index 12e3fd8..564c54f 100644
--- a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
+++ b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c
@@ -81,10 +81,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
index 99c6bb7..9d6a81a 100644
--- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
+++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c
@@ -73,11 +73,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); ++lc) {
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
index d7a5419..82e9771 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c
@@ -78,10 +78,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
index b9898dc..1bbf686 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c
@@ -88,12 +88,10 @@
{
int lc;
- const char *msg;
int status;
pid_t child_pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
index 3d7a560..dec6e41 100644
--- a/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
+++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c
@@ -104,11 +104,9 @@
int main(int ac, char **av)
{
- int lc, ind; /* loop counter */
- const char *msg;
+ int lc, ind;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
index 2da7874..75504b0 100644
--- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
+++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c
@@ -74,13 +74,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* message returned by parse_opts */
-
int i;
struct sched_param param;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
index c4373de..c432401 100644
--- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
+++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c
@@ -56,11 +56,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
index bbb5a15..7527c43 100644
--- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
+++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c
@@ -80,10 +80,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
index 7523f18..5410176 100644
--- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
+++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c
@@ -81,10 +81,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
index f2adc9f..c9686ad 100644
--- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
+++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c
@@ -105,10 +105,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c b/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c
index 435d626..15b9098 100644
--- a/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c
+++ b/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c
@@ -138,13 +138,10 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
index a174a67..a2272eb 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c
@@ -78,10 +78,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
index 454f2e4..9321a4e 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c
@@ -96,10 +96,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
index b4a592f..127a74f 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c
@@ -89,12 +89,10 @@
{
int lc;
- const char *msg;
int status;
pid_t child_pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
index 303b82a..3da1120 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c
@@ -110,11 +110,9 @@
int main(int ac, char **av)
{
- int lc, ind; /* loop counter */
- const char *msg;
+ int lc, ind;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
index 573f078..66b973b 100644
--- a/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
+++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c
@@ -92,12 +92,10 @@
{
int lc;
- const char *msg;
int status;
pid_t child_pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
index f73a47b..1cbce15 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c
@@ -99,13 +99,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
for (lc = 0; TEST_LOOPING(lc); lc++) {
/* reset tst_count in case we are looping */
diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
index 720fdbc..e5b097e 100644
--- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
+++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c
@@ -68,14 +68,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
struct sched_param param;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sched_yield/sched_yield01.c b/testcases/kernel/syscalls/sched_yield/sched_yield01.c
index 09cd616..74501b0 100644
--- a/testcases/kernel/syscalls/sched_yield/sched_yield01.c
+++ b/testcases/kernel/syscalls/sched_yield/sched_yield01.c
@@ -56,11 +56,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/select/select01.c b/testcases/kernel/syscalls/select/select01.c
index dfa89a9..e9100c7 100644
--- a/testcases/kernel/syscalls/select/select01.c
+++ b/testcases/kernel/syscalls/select/select01.c
@@ -62,12 +62,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct timeval timeout;
long test_time = 0; /* in usecs */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/select/select02.c b/testcases/kernel/syscalls/select/select02.c
index c02c64d..3c97427 100644
--- a/testcases/kernel/syscalls/select/select02.c
+++ b/testcases/kernel/syscalls/select/select02.c
@@ -60,12 +60,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct timeval timeout;
long test_time = 0; /* in usecs */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/select/select03.c b/testcases/kernel/syscalls/select/select03.c
index ad99757..a9a81d0 100644
--- a/testcases/kernel/syscalls/select/select03.c
+++ b/testcases/kernel/syscalls/select/select03.c
@@ -64,12 +64,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct timeval timeout;
long test_time = 0; /* in usecs */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/select/select04.c b/testcases/kernel/syscalls/select/select04.c
index 5b655b9..255b009 100644
--- a/testcases/kernel/syscalls/select/select04.c
+++ b/testcases/kernel/syscalls/select/select04.c
@@ -43,13 +43,11 @@
int main(int ac, char **av)
{
int lc, treshold;
- const char *msg;
long long elapsed_us, sleep_us = 100000;
struct timeval timeout;
fd_set fds;
- if ((msg = parse_opts(ac, av, opts, help)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, opts, help);
if (opt_sleep_us) {
sleep_us = atoll(opt_sleep_us);
diff --git a/testcases/kernel/syscalls/send/send01.c b/testcases/kernel/syscalls/send/send01.c
index 00ef693..6f71300 100644
--- a/testcases/kernel/syscalls/send/send01.c
+++ b/testcases/kernel/syscalls/send/send01.c
@@ -250,10 +250,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/sendfile/sendfile02.c b/testcases/kernel/syscalls/sendfile/sendfile02.c
index 875ecef..ba12308 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile02.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile02.c
@@ -269,11 +269,8 @@
{
int i;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/sendfile/sendfile03.c b/testcases/kernel/syscalls/sendfile/sendfile03.c
index d56ae24..cd790cc 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile03.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile03.c
@@ -88,11 +88,8 @@
{
int i;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sendfile/sendfile04.c b/testcases/kernel/syscalls/sendfile/sendfile04.c
index bcbf015..822c468 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile04.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile04.c
@@ -267,11 +267,8 @@
{
int i;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/sendfile/sendfile05.c b/testcases/kernel/syscalls/sendfile/sendfile05.c
index ce8b01d..110194b 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile05.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile05.c
@@ -230,11 +230,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
maybe_run_child(&do_child, "");
diff --git a/testcases/kernel/syscalls/sendfile/sendfile06.c b/testcases/kernel/syscalls/sendfile/sendfile06.c
index 0c85cfd..7945195 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile06.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile06.c
@@ -211,10 +211,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/sendfile/sendfile07.c b/testcases/kernel/syscalls/sendfile/sendfile07.c
index 811af8d..c93363b 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile07.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile07.c
@@ -75,11 +75,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sendfile/sendfile08.c b/testcases/kernel/syscalls/sendfile/sendfile08.c
index 4458675..21b2586 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile08.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile08.c
@@ -54,12 +54,9 @@
{
int lc;
int ret;
- const char *msg;
char buf[BUFSIZ];
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sendfile/sendfile09.c b/testcases/kernel/syscalls/sendfile/sendfile09.c
index dad26f9..0a9d255 100644
--- a/testcases/kernel/syscalls/sendfile/sendfile09.c
+++ b/testcases/kernel/syscalls/sendfile/sendfile09.c
@@ -169,7 +169,6 @@
{
int i;
int lc;
- const char *msg;
#if __WORDSIZE == 32
tst_brkm(TCONF, NULL, "This test is only for 64bit");
@@ -181,8 +180,7 @@
return 0;
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg01.c b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
index 015a329..582851b 100644
--- a/testcases/kernel/syscalls/sendmsg/sendmsg01.c
+++ b/testcases/kernel/syscalls/sendmsg/sendmsg01.c
@@ -364,11 +364,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg02.c b/testcases/kernel/syscalls/sendmsg/sendmsg02.c
index bd25ee5..06f8163 100644
--- a/testcases/kernel/syscalls/sendmsg/sendmsg02.c
+++ b/testcases/kernel/syscalls/sendmsg/sendmsg02.c
@@ -201,12 +201,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
long seconds;
- msg = parse_opts(argc, argv, options, &help);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, &help);
setup();
seconds = tflag ? SAFE_STRTOL(NULL, t_opt, 1, LONG_MAX) : 15;
diff --git a/testcases/kernel/syscalls/sendto/sendto01.c b/testcases/kernel/syscalls/sendto/sendto01.c
index 3577f43..ec07661 100644
--- a/testcases/kernel/syscalls/sendto/sendto01.c
+++ b/testcases/kernel/syscalls/sendto/sendto01.c
@@ -320,10 +320,8 @@
int main(int ac, char *av[])
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
index 350d381..cb67bd3 100644
--- a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
+++ b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c
@@ -78,18 +78,13 @@
#ifdef __NR_set_robust_list
int lc;
#endif
- const char *msg;
#ifdef __NR_set_robust_list
struct robust_list_head head;
size_t len; /* size of structure struct robust_list_head */
int retval;
#endif
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
index eedeb2e..511543c 100644
--- a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
+++ b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c
@@ -77,10 +77,8 @@
int main(int argc, char *argv[])
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
index 0b6e9f8..b7aea1b 100644
--- a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
+++ b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
@@ -104,11 +104,8 @@
{
int newtid = -1;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname01.c b/testcases/kernel/syscalls/setdomainname/setdomainname01.c
index e6b2c3a..0b3e2cf 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname01.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname01.c
@@ -84,12 +84,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname02.c b/testcases/kernel/syscalls/setdomainname/setdomainname02.c
index 269cbda..ce27cbb 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname02.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname02.c
@@ -105,13 +105,9 @@
int main(int ac, char **av)
{
- int lc, ind; /* loop counter */
- const char *msg;
+ int lc, ind;
- if ((msg = parse_opts(ac, av, NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname03.c b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
index 8620514..53d05fb 100644
--- a/testcases/kernel/syscalls/setdomainname/setdomainname03.c
+++ b/testcases/kernel/syscalls/setdomainname/setdomainname03.c
@@ -95,13 +95,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Invoke setup function to call individual test setup functions
diff --git a/testcases/kernel/syscalls/setegid/setegid01.c b/testcases/kernel/syscalls/setegid/setegid01.c
index 65976f3..cb641f3 100644
--- a/testcases/kernel/syscalls/setegid/setegid01.c
+++ b/testcases/kernel/syscalls/setegid/setegid01.c
@@ -43,11 +43,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "Option parsing error - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setegid/setegid02.c b/testcases/kernel/syscalls/setegid/setegid02.c
index 11a67d6..16bf486 100644
--- a/testcases/kernel/syscalls/setegid/setegid02.c
+++ b/testcases/kernel/syscalls/setegid/setegid02.c
@@ -36,11 +36,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid01.c b/testcases/kernel/syscalls/setfsgid/setfsgid01.c
index 097a0a6..45d89c0 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid01.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid01.c
@@ -39,12 +39,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
gid_t gid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid02.c b/testcases/kernel/syscalls/setfsgid/setfsgid02.c
index 1d056f7..4788957 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid02.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid02.c
@@ -42,12 +42,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
gid_t gid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid03.c b/testcases/kernel/syscalls/setfsgid/setfsgid03.c
index a120924..dbe4361 100644
--- a/testcases/kernel/syscalls/setfsgid/setfsgid03.c
+++ b/testcases/kernel/syscalls/setfsgid/setfsgid03.c
@@ -45,12 +45,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
gid_t gid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid01.c b/testcases/kernel/syscalls/setfsuid/setfsuid01.c
index 50767ef..63f9f5d 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid01.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid01.c
@@ -39,12 +39,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t uid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid02.c b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
index c9fe7f1..5807bb6 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid02.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid02.c
@@ -41,12 +41,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t uid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid03.c b/testcases/kernel/syscalls/setfsuid/setfsuid03.c
index 7438f7d..56d51f3 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid03.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid03.c
@@ -44,12 +44,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
uid_t uid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid04.c b/testcases/kernel/syscalls/setfsuid/setfsuid04.c
index 1ad254a..0d5a9ea 100644
--- a/testcases/kernel/syscalls/setfsuid/setfsuid04.c
+++ b/testcases/kernel/syscalls/setfsuid/setfsuid04.c
@@ -56,10 +56,8 @@
int main(int ac, char **av)
{
pid_t pid;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setgid/setgid01.c b/testcases/kernel/syscalls/setgid/setgid01.c
index bf1628b..0c8ef3b 100644
--- a/testcases/kernel/syscalls/setgid/setgid01.c
+++ b/testcases/kernel/syscalls/setgid/setgid01.c
@@ -52,10 +52,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setgid/setgid02.c b/testcases/kernel/syscalls/setgid/setgid02.c
index 982acf5..46bc2a0 100644
--- a/testcases/kernel/syscalls/setgid/setgid02.c
+++ b/testcases/kernel/syscalls/setgid/setgid02.c
@@ -45,10 +45,8 @@
{
struct passwd *getpwnam(), *rootpwent;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setgid/setgid03.c b/testcases/kernel/syscalls/setgid/setgid03.c
index 293a15a..50b6ded 100644
--- a/testcases/kernel/syscalls/setgid/setgid03.c
+++ b/testcases/kernel/syscalls/setgid/setgid03.c
@@ -41,10 +41,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setgroups/setgroups01.c b/testcases/kernel/syscalls/setgroups/setgroups01.c
index f3406b2..ea12ee2 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups01.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups01.c
@@ -132,15 +132,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/setgroups/setgroups02.c b/testcases/kernel/syscalls/setgroups/setgroups02.c
index d53d4d5..43fbbba 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups02.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups02.c
@@ -86,13 +86,11 @@
int main(int ac, char **av)
{
- int lc, i; /* loop counters */
- const char *msg;
+ int lc, i;
int gidsetsize = 1; /* only one GID, the GID of TESTUSER */
int PASS_FLAG = 0; /* used for checking group array */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setgroups/setgroups03.c b/testcases/kernel/syscalls/setgroups/setgroups03.c
index 86b1e6e..c30834a 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups03.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups03.c
@@ -105,14 +105,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int gidsetsize; /* total no. of groups */
int i;
char *test_desc; /* test specific error message */
int ngroups_max = sysconf(_SC_NGROUPS_MAX); /* max no. of groups in the current system */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
groups_list = malloc(ngroups_max * sizeof(GID_T));
if (groups_list == NULL) {
diff --git a/testcases/kernel/syscalls/setgroups/setgroups04.c b/testcases/kernel/syscalls/setgroups/setgroups04.c
index 381d886..f732a62 100644
--- a/testcases/kernel/syscalls/setgroups/setgroups04.c
+++ b/testcases/kernel/syscalls/setgroups/setgroups04.c
@@ -84,12 +84,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int gidsetsize; /* total no. of groups */
char *test_desc; /* test specific error message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/* Perform setup for test */
setup();
diff --git a/testcases/kernel/syscalls/sethostname/sethostname01.c b/testcases/kernel/syscalls/sethostname/sethostname01.c
index 24a377d..ef02263 100644
--- a/testcases/kernel/syscalls/sethostname/sethostname01.c
+++ b/testcases/kernel/syscalls/sethostname/sethostname01.c
@@ -83,14 +83,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char ltphost[] = "ltphost"; /* temporary host name to set */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/* Do initial setup. */
setup();
diff --git a/testcases/kernel/syscalls/sethostname/sethostname02.c b/testcases/kernel/syscalls/sethostname/sethostname02.c
index 516d511..2690437 100644
--- a/testcases/kernel/syscalls/sethostname/sethostname02.c
+++ b/testcases/kernel/syscalls/sethostname/sethostname02.c
@@ -118,11 +118,8 @@
{
int i;
int lc;
- const char *msg; /* parse_opts() return message */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/* Do initial setup */
setup();
diff --git a/testcases/kernel/syscalls/sethostname/sethostname03.c b/testcases/kernel/syscalls/sethostname/sethostname03.c
index 59f4e40..65968b3 100644
--- a/testcases/kernel/syscalls/sethostname/sethostname03.c
+++ b/testcases/kernel/syscalls/sethostname/sethostname03.c
@@ -92,12 +92,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/* Do initial setup */
setup();
diff --git a/testcases/kernel/syscalls/setitimer/setitimer01.c b/testcases/kernel/syscalls/setitimer/setitimer01.c
index d86333f..6874b94 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer01.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer01.c
@@ -69,12 +69,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct itimerval *value, *ovalue;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setitimer/setitimer02.c b/testcases/kernel/syscalls/setitimer/setitimer02.c
index 813b472..4d13cd1 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer02.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer02.c
@@ -68,12 +68,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct itimerval *value;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c
index ff5b426..418ec71 100644
--- a/testcases/kernel/syscalls/setitimer/setitimer03.c
+++ b/testcases/kernel/syscalls/setitimer/setitimer03.c
@@ -66,12 +66,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct itimerval *value, *ovalue;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setns/setns01.c b/testcases/kernel/syscalls/setns/setns01.c
index 2ad010e..324341b 100644
--- a/testcases/kernel/syscalls/setns/setns01.c
+++ b/testcases/kernel/syscalls/setns/setns01.c
@@ -189,11 +189,8 @@
int main(int argc, char *argv[])
{
int lc, testno;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/setns/setns02.c b/testcases/kernel/syscalls/setns/setns02.c
index e0a50f8..9a70778 100644
--- a/testcases/kernel/syscalls/setns/setns02.c
+++ b/testcases/kernel/syscalls/setns/setns02.c
@@ -162,11 +162,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/setpgid/setpgid01.c b/testcases/kernel/syscalls/setpgid/setpgid01.c
index 9ed9581..89c9a37 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid01.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid01.c
@@ -59,10 +59,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c
index c1ec930..73e88d0 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid02.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid02.c
@@ -85,12 +85,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setpgid/setpgid03.c b/testcases/kernel/syscalls/setpgid/setpgid03.c
index 9c7f826..96ebe14 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid03.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid03.c
@@ -53,10 +53,8 @@
int status;
int rval;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp01.c b/testcases/kernel/syscalls/setpgrp/setpgrp01.c
index 079ca60..3fdb8cb 100644
--- a/testcases/kernel/syscalls/setpgrp/setpgrp01.c
+++ b/testcases/kernel/syscalls/setpgrp/setpgrp01.c
@@ -49,10 +49,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp02.c b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
index 9348b1a..681223b 100644
--- a/testcases/kernel/syscalls/setpgrp/setpgrp02.c
+++ b/testcases/kernel/syscalls/setpgrp/setpgrp02.c
@@ -57,14 +57,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* message returned by parse_opts */
int pid, oldpgrp;
int e_code, status, retval = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setpriority/setpriority01.c b/testcases/kernel/syscalls/setpriority/setpriority01.c
index 3db7ced..2354a9c 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority01.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority01.c
@@ -38,12 +38,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int new_val;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setpriority/setpriority02.c b/testcases/kernel/syscalls/setpriority/setpriority02.c
index 53466e7..2dd0a62 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority02.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority02.c
@@ -70,12 +70,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int new_val = -2;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority03.c b/testcases/kernel/syscalls/setpriority/setpriority03.c
index 76e93af..e61899e 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority03.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority03.c
@@ -69,12 +69,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int new_val = 2;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority04.c b/testcases/kernel/syscalls/setpriority/setpriority04.c
index fb55fce..162a364 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority04.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority04.c
@@ -66,13 +66,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int new_val = 2;
pid_t unused_pid;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setpriority/setpriority05.c b/testcases/kernel/syscalls/setpriority/setpriority05.c
index 971c4d5..5fe81cf 100644
--- a/testcases/kernel/syscalls/setpriority/setpriority05.c
+++ b/testcases/kernel/syscalls/setpriority/setpriority05.c
@@ -70,13 +70,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int new_val = 2;
int init_val = 1; /* the init process = id 1 */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/setregid/setregid01.c b/testcases/kernel/syscalls/setregid/setregid01.c
index 6e37623..29a8a05 100644
--- a/testcases/kernel/syscalls/setregid/setregid01.c
+++ b/testcases/kernel/syscalls/setregid/setregid01.c
@@ -56,10 +56,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setregid/setregid02.c b/testcases/kernel/syscalls/setregid/setregid02.c
index 56bcc99..c4318c9 100644
--- a/testcases/kernel/syscalls/setregid/setregid02.c
+++ b/testcases/kernel/syscalls/setregid/setregid02.c
@@ -79,10 +79,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setregid/setregid03.c b/testcases/kernel/syscalls/setregid/setregid03.c
index 85d74de..4bc4c83 100644
--- a/testcases/kernel/syscalls/setregid/setregid03.c
+++ b/testcases/kernel/syscalls/setregid/setregid03.c
@@ -87,10 +87,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setregid/setregid04.c b/testcases/kernel/syscalls/setregid/setregid04.c
index b9426ab..bf662da 100644
--- a/testcases/kernel/syscalls/setregid/setregid04.c
+++ b/testcases/kernel/syscalls/setregid/setregid04.c
@@ -79,10 +79,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresgid/setresgid01.c b/testcases/kernel/syscalls/setresgid/setresgid01.c
index fec171a..30a85db 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid01.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid01.c
@@ -117,11 +117,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresgid/setresgid02.c b/testcases/kernel/syscalls/setresgid/setresgid02.c
index 94fd0c1..1e8d0ad 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid02.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid02.c
@@ -124,11 +124,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresgid/setresgid03.c b/testcases/kernel/syscalls/setresgid/setresgid03.c
index b08818e..bd3001d 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid03.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid03.c
@@ -116,11 +116,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresgid/setresgid04.c b/testcases/kernel/syscalls/setresgid/setresgid04.c
index 2c371d3..5a3c127 100644
--- a/testcases/kernel/syscalls/setresgid/setresgid04.c
+++ b/testcases/kernel/syscalls/setresgid/setresgid04.c
@@ -41,11 +41,8 @@
int main(int argc, char **argv)
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresuid/setresuid01.c b/testcases/kernel/syscalls/setresuid/setresuid01.c
index e94894d..a07bbd8 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid01.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid01.c
@@ -122,12 +122,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresuid/setresuid02.c b/testcases/kernel/syscalls/setresuid/setresuid02.c
index 4140f80..617501c 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid02.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid02.c
@@ -112,12 +112,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresuid/setresuid03.c b/testcases/kernel/syscalls/setresuid/setresuid03.c
index 0575985..5a2ba5a 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid03.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid03.c
@@ -120,12 +120,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setresuid/setresuid04.c b/testcases/kernel/syscalls/setresuid/setresuid04.c
index bc47295..639c4df 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid04.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid04.c
@@ -69,10 +69,8 @@
int main(int ac, char **av)
{
pid_t pid;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
pid = FORK_OR_VFORK();
diff --git a/testcases/kernel/syscalls/setresuid/setresuid05.c b/testcases/kernel/syscalls/setresuid/setresuid05.c
index cbb9ee6..fae1b6c 100644
--- a/testcases/kernel/syscalls/setresuid/setresuid05.c
+++ b/testcases/kernel/syscalls/setresuid/setresuid05.c
@@ -41,11 +41,8 @@
int main(int argc, char **argv)
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c
index c015517..54ba2d7 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid01.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid01.c
@@ -56,10 +56,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid02.c b/testcases/kernel/syscalls/setreuid/setreuid02.c
index 5a79710..9cc0333 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid02.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid02.c
@@ -67,10 +67,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid03.c b/testcases/kernel/syscalls/setreuid/setreuid03.c
index 93b7a45..2533908 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid03.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid03.c
@@ -92,10 +92,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid04.c b/testcases/kernel/syscalls/setreuid/setreuid04.c
index e92d05e..f05f61d 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid04.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid04.c
@@ -64,10 +64,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid05.c b/testcases/kernel/syscalls/setreuid/setreuid05.c
index 9a9559d..d6c4c6f 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid05.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid05.c
@@ -85,10 +85,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid06.c b/testcases/kernel/syscalls/setreuid/setreuid06.c
index ae1f500..3364c14 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid06.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid06.c
@@ -48,10 +48,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setreuid/setreuid07.c b/testcases/kernel/syscalls/setreuid/setreuid07.c
index 6196824..54299fc 100644
--- a/testcases/kernel/syscalls/setreuid/setreuid07.c
+++ b/testcases/kernel/syscalls/setreuid/setreuid07.c
@@ -53,10 +53,8 @@
int main(int ac, char **av)
{
pid_t pid;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit01.c b/testcases/kernel/syscalls/setrlimit/setrlimit01.c
index b403409..cb06b4e 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit01.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit01.c
@@ -57,11 +57,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit02.c b/testcases/kernel/syscalls/setrlimit/setrlimit02.c
index bb45cf6..0b249d0 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit02.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit02.c
@@ -79,12 +79,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit03.c b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
index 247a301..b0b4a39 100644
--- a/testcases/kernel/syscalls/setrlimit/setrlimit03.c
+++ b/testcases/kernel/syscalls/setrlimit/setrlimit03.c
@@ -61,12 +61,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct rlimit rlim;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setsid/setsid01.c b/testcases/kernel/syscalls/setsid/setsid01.c
index 3e6eaf8..ad5687c 100644
--- a/testcases/kernel/syscalls/setsid/setsid01.c
+++ b/testcases/kernel/syscalls/setsid/setsid01.c
@@ -66,10 +66,8 @@
int exno = 0;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/setsockopt/setsockopt01.c b/testcases/kernel/syscalls/setsockopt/setsockopt01.c
index ee98356..f25694a 100644
--- a/testcases/kernel/syscalls/setsockopt/setsockopt01.c
+++ b/testcases/kernel/syscalls/setsockopt/setsockopt01.c
@@ -131,12 +131,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); ++lc) {
diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday01.c b/testcases/kernel/syscalls/settimeofday/settimeofday01.c
index f15f6f3..1d018e2 100644
--- a/testcases/kernel/syscalls/settimeofday/settimeofday01.c
+++ b/testcases/kernel/syscalls/settimeofday/settimeofday01.c
@@ -78,13 +78,9 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
suseconds_t delta;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday02.c b/testcases/kernel/syscalls/settimeofday/settimeofday02.c
index d5e3341..f0497b4 100644
--- a/testcases/kernel/syscalls/settimeofday/settimeofday02.c
+++ b/testcases/kernel/syscalls/settimeofday/settimeofday02.c
@@ -83,11 +83,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setuid/setuid01.c b/testcases/kernel/syscalls/setuid/setuid01.c
index 73d8c64..c6061b8 100644
--- a/testcases/kernel/syscalls/setuid/setuid01.c
+++ b/testcases/kernel/syscalls/setuid/setuid01.c
@@ -54,10 +54,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setuid/setuid02.c b/testcases/kernel/syscalls/setuid/setuid02.c
index 135d622..89d52eb 100644
--- a/testcases/kernel/syscalls/setuid/setuid02.c
+++ b/testcases/kernel/syscalls/setuid/setuid02.c
@@ -128,13 +128,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/setuid/setuid03.c b/testcases/kernel/syscalls/setuid/setuid03.c
index 8491c56..cc0d91d 100644
--- a/testcases/kernel/syscalls/setuid/setuid03.c
+++ b/testcases/kernel/syscalls/setuid/setuid03.c
@@ -44,10 +44,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setuid/setuid04.c b/testcases/kernel/syscalls/setuid/setuid04.c
index 27277a0..f1896ad 100644
--- a/testcases/kernel/syscalls/setuid/setuid04.c
+++ b/testcases/kernel/syscalls/setuid/setuid04.c
@@ -52,11 +52,9 @@
int main(int ac, char **av)
{
pid_t pid;
- const char *msg;
int status;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setxattr/setxattr01.c b/testcases/kernel/syscalls/setxattr/setxattr01.c
index fb6083d..4622151 100644
--- a/testcases/kernel/syscalls/setxattr/setxattr01.c
+++ b/testcases/kernel/syscalls/setxattr/setxattr01.c
@@ -149,11 +149,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setxattr/setxattr02.c b/testcases/kernel/syscalls/setxattr/setxattr02.c
index e9bc9f3..35fa895 100644
--- a/testcases/kernel/syscalls/setxattr/setxattr02.c
+++ b/testcases/kernel/syscalls/setxattr/setxattr02.c
@@ -149,11 +149,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/setxattr/setxattr03.c b/testcases/kernel/syscalls/setxattr/setxattr03.c
index 2e0f6c5..5b27385 100644
--- a/testcases/kernel/syscalls/setxattr/setxattr03.c
+++ b/testcases/kernel/syscalls/setxattr/setxattr03.c
@@ -108,11 +108,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sgetmask/sgetmask01.c b/testcases/kernel/syscalls/sgetmask/sgetmask01.c
index 92dd238..7114856 100644
--- a/testcases/kernel/syscalls/sgetmask/sgetmask01.c
+++ b/testcases/kernel/syscalls/sgetmask/sgetmask01.c
@@ -115,11 +115,8 @@
{
int sig;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sigaction/sigaction01.c b/testcases/kernel/syscalls/sigaction/sigaction01.c
index e47d6b0..e8e8a49 100644
--- a/testcases/kernel/syscalls/sigaction/sigaction01.c
+++ b/testcases/kernel/syscalls/sigaction/sigaction01.c
@@ -228,15 +228,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg; /* message got from parse_opts */
int i;
int test_flags[] = { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND,
SA_RESETHAND | SA_SIGINFO, SA_RESETHAND | SA_SIGINFO
};
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sigaction/sigaction02.c b/testcases/kernel/syscalls/sigaction/sigaction02.c
index 11ed794..641a04e 100644
--- a/testcases/kernel/syscalls/sigaction/sigaction02.c
+++ b/testcases/kernel/syscalls/sigaction/sigaction02.c
@@ -110,13 +110,9 @@
int main(int ac, char **av)
{
- const char *msg; /* message got from parse_opts */
-
int ret;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
//test1:
testcase_no = 1;
diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
index 80cf7e5..9a2e3a4 100644
--- a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
+++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c
@@ -94,14 +94,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
void *alt_stk; /* address of alternate stack for signal */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
index 74d8a62..c5ab797 100644
--- a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
+++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c
@@ -110,14 +110,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *test_desc; /* test specific error message */
int ind; /* counter to test different test conditions */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c
index b72349c..0f334d1 100644
--- a/testcases/kernel/syscalls/sighold/sighold02.c
+++ b/testcases/kernel/syscalls/sighold/sighold02.c
@@ -160,15 +160,11 @@
int term_stat; /* child return status */
int sig; /* current signal */
int lc;
- const char *msg;
/***************************************************************
* parse standard options, and exit if there is an error
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "dd", &CHILDSWRITEFD, &CHILDSREADFD);
#endif
diff --git a/testcases/kernel/syscalls/signal/signal01.c b/testcases/kernel/syscalls/signal/signal01.c
index de5edb7..6b1a33a 100644
--- a/testcases/kernel/syscalls/signal/signal01.c
+++ b/testcases/kernel/syscalls/signal/signal01.c
@@ -232,14 +232,11 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
maybe_run_child(&do_child_uclinux, "dd", &test_case_uclinux, &fd1[1]);
diff --git a/testcases/kernel/syscalls/signal/signal02.c b/testcases/kernel/syscalls/signal/signal02.c
index 721ab93..8eb95b5 100644
--- a/testcases/kernel/syscalls/signal/signal02.c
+++ b/testcases/kernel/syscalls/signal/signal02.c
@@ -72,12 +72,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/signal/signal03.c b/testcases/kernel/syscalls/signal/signal03.c
index 1b2c05b..c9f8017 100644
--- a/testcases/kernel/syscalls/signal/signal03.c
+++ b/testcases/kernel/syscalls/signal/signal03.c
@@ -90,13 +90,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int i, rval;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/signal/signal04.c b/testcases/kernel/syscalls/signal/signal04.c
index 88a5ca1..baca161 100644
--- a/testcases/kernel/syscalls/signal/signal04.c
+++ b/testcases/kernel/syscalls/signal/signal04.c
@@ -84,13 +84,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
sighandler_t rval, first;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/signal/signal05.c b/testcases/kernel/syscalls/signal/signal05.c
index e9e5899..2a28941 100644
--- a/testcases/kernel/syscalls/signal/signal05.c
+++ b/testcases/kernel/syscalls/signal/signal05.c
@@ -90,13 +90,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int i, rval;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/signalfd/signalfd01.c b/testcases/kernel/syscalls/signalfd/signalfd01.c
index 8f525bb..48c9292 100644
--- a/testcases/kernel/syscalls/signalfd/signalfd01.c
+++ b/testcases/kernel/syscalls/signalfd/signalfd01.c
@@ -271,7 +271,6 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int sfd;
if ((tst_kvercmp(2, 6, 22)) < 0) {
@@ -280,9 +279,7 @@
exit(0);
}
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
index 5927646..4dc60d2 100644
--- a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
+++ b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c
@@ -128,12 +128,8 @@
int fd, coe;
sigset_t ss;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
index 6539199..800687d 100644
--- a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
+++ b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c
@@ -123,12 +123,8 @@
sigset_t ss;
int fd, fl;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/sigpending/sigpending02.c b/testcases/kernel/syscalls/sigpending/sigpending02.c
index ed0b2d1..21a5f92 100644
--- a/testcases/kernel/syscalls/sigpending/sigpending02.c
+++ b/testcases/kernel/syscalls/sigpending/sigpending02.c
@@ -67,13 +67,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
sigset_t *sigset;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
index ab825f3..20fca52 100644
--- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
+++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c
@@ -97,14 +97,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t my_pid; /* test process id */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- /*NOTREACED*/}
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sigrelse/sigrelse01.c b/testcases/kernel/syscalls/sigrelse/sigrelse01.c
index 6931729..f94ba35 100644
--- a/testcases/kernel/syscalls/sigrelse/sigrelse01.c
+++ b/testcases/kernel/syscalls/sigrelse/sigrelse01.c
@@ -183,7 +183,6 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
/* gcc -Wall complains about sig_caught not being ref'd because of the
external declarations. */
@@ -192,10 +191,7 @@
/*
* parse standard options
*/
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&child, "dd", &pipe_fd[1], &pipe_fd2[0]);
#endif
diff --git a/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c b/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
index a044157..b84f986 100644
--- a/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
+++ b/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c
@@ -94,10 +94,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
index 49f7a88..1cc3918 100644
--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
+++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
@@ -446,10 +446,8 @@
{
unsigned i;
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/socket/socket01.c b/testcases/kernel/syscalls/socket/socket01.c
index ba206c3..f471d8b 100644
--- a/testcases/kernel/syscalls/socket/socket01.c
+++ b/testcases/kernel/syscalls/socket/socket01.c
@@ -83,13 +83,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int s;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/socket/socket02.c b/testcases/kernel/syscalls/socket/socket02.c
index f4dceaf..259f0e3 100644
--- a/testcases/kernel/syscalls/socket/socket02.c
+++ b/testcases/kernel/syscalls/socket/socket02.c
@@ -131,12 +131,8 @@
{
int fd, fds[2], i, coe;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/socket/socket03.c b/testcases/kernel/syscalls/socket/socket03.c
index aad524a..2f069f2 100644
--- a/testcases/kernel/syscalls/socket/socket03.c
+++ b/testcases/kernel/syscalls/socket/socket03.c
@@ -118,12 +118,8 @@
{
int fd, fl;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/socketcall/socketcall01.c b/testcases/kernel/syscalls/socketcall/socketcall01.c
index 01ad0f5..d439729 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall01.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall01.c
@@ -104,12 +104,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i; /* s is socket descriptor */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/socketcall/socketcall02.c b/testcases/kernel/syscalls/socketcall/socketcall02.c
index 0be1c53..cec0246 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall02.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall02.c
@@ -102,11 +102,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/socketcall/socketcall03.c b/testcases/kernel/syscalls/socketcall/socketcall03.c
index 49ee1c2..244a286 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall03.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall03.c
@@ -102,11 +102,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/socketcall/socketcall04.c b/testcases/kernel/syscalls/socketcall/socketcall04.c
index a2f940c..584c8f3 100644
--- a/testcases/kernel/syscalls/socketcall/socketcall04.c
+++ b/testcases/kernel/syscalls/socketcall/socketcall04.c
@@ -102,11 +102,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/socketpair/socketpair01.c b/testcases/kernel/syscalls/socketpair/socketpair01.c
index 72c56a2..3a045b7 100644
--- a/testcases/kernel/syscalls/socketpair/socketpair01.c
+++ b/testcases/kernel/syscalls/socketpair/socketpair01.c
@@ -93,11 +93,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int s;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sockioctl/sockioctl01.c b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
index 7fb384d..50bdc93 100644
--- a/testcases/kernel/syscalls/sockioctl/sockioctl01.c
+++ b/testcases/kernel/syscalls/sockioctl/sockioctl01.c
@@ -120,11 +120,8 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c
index 2c4f429..ce880b9 100644
--- a/testcases/kernel/syscalls/splice/splice01.c
+++ b/testcases/kernel/syscalls/splice/splice01.c
@@ -54,10 +54,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)))
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/splice/splice03.c b/testcases/kernel/syscalls/splice/splice03.c
index b80ac27..b18c52a 100644
--- a/testcases/kernel/syscalls/splice/splice03.c
+++ b/testcases/kernel/syscalls/splice/splice03.c
@@ -84,11 +84,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ssetmask/ssetmask01.c b/testcases/kernel/syscalls/ssetmask/ssetmask01.c
index 2965320..d024696 100644
--- a/testcases/kernel/syscalls/ssetmask/ssetmask01.c
+++ b/testcases/kernel/syscalls/ssetmask/ssetmask01.c
@@ -104,11 +104,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/stat/stat01.c b/testcases/kernel/syscalls/stat/stat01.c
index 3f0d13c..5dfb88e 100644
--- a/testcases/kernel/syscalls/stat/stat01.c
+++ b/testcases/kernel/syscalls/stat/stat01.c
@@ -78,10 +78,8 @@
{
struct stat stat_buf;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/stat/stat02.c b/testcases/kernel/syscalls/stat/stat02.c
index 5271b9f..2cf726f 100644
--- a/testcases/kernel/syscalls/stat/stat02.c
+++ b/testcases/kernel/syscalls/stat/stat02.c
@@ -100,10 +100,8 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/stat/stat03.c b/testcases/kernel/syscalls/stat/stat03.c
index 680e69a..f78fd94 100644
--- a/testcases/kernel/syscalls/stat/stat03.c
+++ b/testcases/kernel/syscalls/stat/stat03.c
@@ -137,13 +137,11 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
char *file_name; /* ptr. for file name whose mode is modified */
char *test_desc; /* test specific error message */
int ind; /* counter to test different test conditions */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Invoke setup function to call individual test setup functions
diff --git a/testcases/kernel/syscalls/stat/stat05.c b/testcases/kernel/syscalls/stat/stat05.c
index 21b4d21..b692988 100644
--- a/testcases/kernel/syscalls/stat/stat05.c
+++ b/testcases/kernel/syscalls/stat/stat05.c
@@ -130,10 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/stat/stat06.c b/testcases/kernel/syscalls/stat/stat06.c
index 0ddf730..c6f11a3 100644
--- a/testcases/kernel/syscalls/stat/stat06.c
+++ b/testcases/kernel/syscalls/stat/stat06.c
@@ -175,7 +175,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *fname;
char *desc;
int ind;
@@ -185,9 +184,7 @@
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/statfs/statfs01.c b/testcases/kernel/syscalls/statfs/statfs01.c
index 7f9ab56..12ddb9c 100644
--- a/testcases/kernel/syscalls/statfs/statfs01.c
+++ b/testcases/kernel/syscalls/statfs/statfs01.c
@@ -130,13 +130,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/statfs/statfs02.c b/testcases/kernel/syscalls/statfs/statfs02.c
index 9e9b59d..279665f 100644
--- a/testcases/kernel/syscalls/statfs/statfs02.c
+++ b/testcases/kernel/syscalls/statfs/statfs02.c
@@ -77,12 +77,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/statfs/statfs03.c b/testcases/kernel/syscalls/statfs/statfs03.c
index aedeaf3..031b8d1 100644
--- a/testcases/kernel/syscalls/statfs/statfs03.c
+++ b/testcases/kernel/syscalls/statfs/statfs03.c
@@ -73,10 +73,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/statvfs/statvfs01.c b/testcases/kernel/syscalls/statvfs/statvfs01.c
index 84dd0ac..1523058 100644
--- a/testcases/kernel/syscalls/statvfs/statvfs01.c
+++ b/testcases/kernel/syscalls/statvfs/statvfs01.c
@@ -42,10 +42,8 @@
{
struct statvfs buf;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/statvfs/statvfs02.c b/testcases/kernel/syscalls/statvfs/statvfs02.c
index e7ad990..927cedc 100644
--- a/testcases/kernel/syscalls/statvfs/statvfs02.c
+++ b/testcases/kernel/syscalls/statvfs/statvfs02.c
@@ -61,11 +61,8 @@
int main(int argc, char **argv)
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/stime/stime01.c b/testcases/kernel/syscalls/stime/stime01.c
index 64b6842..8698152 100644
--- a/testcases/kernel/syscalls/stime/stime01.c
+++ b/testcases/kernel/syscalls/stime/stime01.c
@@ -93,13 +93,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/stime/stime02.c b/testcases/kernel/syscalls/stime/stime02.c
index a812dc3..a19fc1e 100644
--- a/testcases/kernel/syscalls/stime/stime02.c
+++ b/testcases/kernel/syscalls/stime/stime02.c
@@ -92,13 +92,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c
index 6a23de1..fdabe48 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff01.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff01.c
@@ -39,10 +39,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/swapoff/swapoff02.c b/testcases/kernel/syscalls/swapoff/swapoff02.c
index fffddc4..b3cbd40 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff02.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff02.c
@@ -61,10 +61,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/swapon/swapon01.c b/testcases/kernel/syscalls/swapon/swapon01.c
index cda8ec2..523b80d 100644
--- a/testcases/kernel/syscalls/swapon/swapon01.c
+++ b/testcases/kernel/syscalls/swapon/swapon01.c
@@ -61,10 +61,8 @@
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/swapon/swapon02.c b/testcases/kernel/syscalls/swapon/swapon02.c
index db74ba9..d10885b 100644
--- a/testcases/kernel/syscalls/swapon/swapon02.c
+++ b/testcases/kernel/syscalls/swapon/swapon02.c
@@ -95,10 +95,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
index 93276eb..f85c310 100644
--- a/testcases/kernel/syscalls/swapon/swapon03.c
+++ b/testcases/kernel/syscalls/swapon/swapon03.c
@@ -69,10 +69,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/symlink/symlink01.c b/testcases/kernel/syscalls/symlink/symlink01.c
index 36eb7da..61c4541 100644
--- a/testcases/kernel/syscalls/symlink/symlink01.c
+++ b/testcases/kernel/syscalls/symlink/symlink01.c
@@ -518,15 +518,8 @@
{
struct tcses *tcs_ptr;
int lc;
- const char *msg;
- /***************************************************************
- * parse standard options, and exit if there is an error
- ***************************************************************/
- if ((msg = parse_opts(argc, argv, Options, &help)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, Options, &help);
/*
* If the -T option was used, use that TCID or use the default
diff --git a/testcases/kernel/syscalls/symlink/symlink02.c b/testcases/kernel/syscalls/symlink/symlink02.c
index ec1250b..45aaef3 100644
--- a/testcases/kernel/syscalls/symlink/symlink02.c
+++ b/testcases/kernel/syscalls/symlink/symlink02.c
@@ -128,13 +128,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/symlink/symlink03.c b/testcases/kernel/syscalls/symlink/symlink03.c
index 5df790f..78f3164 100644
--- a/testcases/kernel/syscalls/symlink/symlink03.c
+++ b/testcases/kernel/syscalls/symlink/symlink03.c
@@ -149,17 +149,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *test_file; /* testfile name */
char *sym_file; /* symbolic link file name */
char *test_desc; /* test specific error message */
int ind; /* counter to test different test conditions */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* Invoke setup function to call individual test setup functions
diff --git a/testcases/kernel/syscalls/symlink/symlink04.c b/testcases/kernel/syscalls/symlink/symlink04.c
index 11174fe..8c978d8 100644
--- a/testcases/kernel/syscalls/symlink/symlink04.c
+++ b/testcases/kernel/syscalls/symlink/symlink04.c
@@ -91,13 +91,8 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/symlink/symlink05.c b/testcases/kernel/syscalls/symlink/symlink05.c
index 242e487..3986f42 100644
--- a/testcases/kernel/syscalls/symlink/symlink05.c
+++ b/testcases/kernel/syscalls/symlink/symlink05.c
@@ -91,13 +91,8 @@
{
struct stat stat_buf; /* stat structure buffer */
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
index 156667d..5c238d8 100644
--- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
@@ -140,7 +140,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Disable test if the version of the kernel is less than 2.6.16 */
@@ -150,8 +149,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sync/sync01.c b/testcases/kernel/syscalls/sync/sync01.c
index 4f09cda..dd0a336 100644
--- a/testcases/kernel/syscalls/sync/sync01.c
+++ b/testcases/kernel/syscalls/sync/sync01.c
@@ -123,13 +123,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/sync/sync02.c b/testcases/kernel/syscalls/sync/sync02.c
index 24e1510..d4fd94c 100644
--- a/testcases/kernel/syscalls/sync/sync02.c
+++ b/testcases/kernel/syscalls/sync/sync02.c
@@ -91,11 +91,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char read_buffer[BUFSIZ]; /* buffer used to read data from file */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
index 33d2e31..935786b 100644
--- a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
@@ -245,10 +245,8 @@
{
int test_index = 0;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#if defined(__powerpc__) || defined(__powerpc64__) /* for PPC, kernel version > 2.6.21 needed */
if (tst_kvercmp(2, 16, 22) < 0) {
diff --git a/testcases/kernel/syscalls/sysctl/sysctl01.c b/testcases/kernel/syscalls/sysctl/sysctl01.c
index b8900ad..fe62905 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl01.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl01.c
@@ -99,14 +99,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
char *comp_string;
comp_string = NULL;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysctl/sysctl03.c b/testcases/kernel/syscalls/sysctl/sysctl03.c
index b0cff43..88890b6 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl03.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl03.c
@@ -96,7 +96,6 @@
{
int exp_eno;
int lc;
- const char *msg;
char osname[OSNAMESZ];
int osnamelth, status;
@@ -104,9 +103,7 @@
pid_t pid;
struct passwd *ltpuser;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysctl/sysctl04.c b/testcases/kernel/syscalls/sysctl/sysctl04.c
index 861b021..ff63364 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl04.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl04.c
@@ -88,16 +88,13 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char osname[OSNAMESZ];
int i;
size_t osnamelth;
int name[] = { CTL_KERN, KERN_OSREV };
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysctl/sysctl05.c b/testcases/kernel/syscalls/sysctl/sysctl05.c
index 1542a7a..e6f09b2 100644
--- a/testcases/kernel/syscalls/sysctl/sysctl05.c
+++ b/testcases/kernel/syscalls/sysctl/sysctl05.c
@@ -103,13 +103,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
int ret = 0;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysfs/sysfs01.c b/testcases/kernel/syscalls/sysfs/sysfs01.c
index 3121fe5..11ebe43 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs01.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs01.c
@@ -80,10 +80,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysfs/sysfs02.c b/testcases/kernel/syscalls/sysfs/sysfs02.c
index ae3f533..f7cb96a 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs02.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs02.c
@@ -78,11 +78,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char buf[40]; /* 40 bytes suffice to store fs name */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysfs/sysfs03.c b/testcases/kernel/syscalls/sysfs/sysfs03.c
index 887b841..59b997e 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs03.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs03.c
@@ -78,10 +78,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysfs/sysfs04.c b/testcases/kernel/syscalls/sysfs/sysfs04.c
index f141e72..f4fda36 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs04.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs04.c
@@ -82,10 +82,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysfs/sysfs05.c b/testcases/kernel/syscalls/sysfs/sysfs05.c
index 116d6c7..e97f0c8 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs05.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs05.c
@@ -96,10 +96,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysfs/sysfs06.c b/testcases/kernel/syscalls/sysfs/sysfs06.c
index 07e0d2a..121e944 100644
--- a/testcases/kernel/syscalls/sysfs/sysfs06.c
+++ b/testcases/kernel/syscalls/sysfs/sysfs06.c
@@ -99,10 +99,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
index 672c44e..2ea44a2 100644
--- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c
@@ -83,15 +83,12 @@
{
struct sysinfo *sys_buf;
int lc;
- const char *msg;
float l1, l2, l3;
unsigned long l1_up, l2_up, l3_up;
sys_buf = malloc(sizeof(struct sysinfo));
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* Global setup */
diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
index 924ee6f..678b8f1 100644
--- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c
+++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c
@@ -84,13 +84,10 @@
{
struct sysinfo *sysinfo_buf;
int lc;
- const char *msg;
sysinfo_buf = (void *)INVALID_ADDRESS;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* Global setup */
diff --git a/testcases/kernel/syscalls/syslog/syslog11.c b/testcases/kernel/syscalls/syslog/syslog11.c
index 725257b..8f53378 100644
--- a/testcases/kernel/syscalls/syslog/syslog11.c
+++ b/testcases/kernel/syscalls/syslog/syslog11.c
@@ -117,11 +117,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); lc++) {
diff --git a/testcases/kernel/syscalls/syslog/syslog12.c b/testcases/kernel/syscalls/syslog/syslog12.c
index 0571f7c..9e7300b 100644
--- a/testcases/kernel/syscalls/syslog/syslog12.c
+++ b/testcases/kernel/syscalls/syslog/syslog12.c
@@ -126,13 +126,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
struct sigaction sa;
int ret;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c
index 1fd0794..1b7f9c7 100644
--- a/testcases/kernel/syscalls/tee/tee01.c
+++ b/testcases/kernel/syscalls/tee/tee01.c
@@ -57,10 +57,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/tee/tee02.c b/testcases/kernel/syscalls/tee/tee02.c
index 257da61..2173cd2 100644
--- a/testcases/kernel/syscalls/tee/tee02.c
+++ b/testcases/kernel/syscalls/tee/tee02.c
@@ -64,11 +64,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/time/time01.c b/testcases/kernel/syscalls/time/time01.c
index dec283b..616a21f 100644
--- a/testcases/kernel/syscalls/time/time01.c
+++ b/testcases/kernel/syscalls/time/time01.c
@@ -124,10 +124,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/time/time02.c b/testcases/kernel/syscalls/time/time02.c
index 0231311..137a3fd 100644
--- a/testcases/kernel/syscalls/time/time02.c
+++ b/testcases/kernel/syscalls/time/time02.c
@@ -86,11 +86,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
time_t tloc; /* time_t variables for time(2) */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
index c988c07..d186c1f 100644
--- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
@@ -47,12 +47,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int timer;
struct sigevent ev;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
index 2384472..b583aee 100644
--- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
@@ -46,14 +46,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct sigevent ev;
struct itimerspec spec;
int timer;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/timerfd/timerfd02.c b/testcases/kernel/syscalls/timerfd/timerfd02.c
index 114fe4a..006ef16 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd02.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd02.c
@@ -126,12 +126,8 @@
{
int fd, coe;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/timerfd/timerfd03.c b/testcases/kernel/syscalls/timerfd/timerfd03.c
index 0bf234a..dc8efd4 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd03.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd03.c
@@ -122,12 +122,8 @@
{
int fd, fl;
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
if ((tst_kvercmp(2, 6, 27)) < 0) {
tst_brkm(TCONF,
NULL,
diff --git a/testcases/kernel/syscalls/timerfd/timerfd_create01.c b/testcases/kernel/syscalls/timerfd/timerfd_create01.c
index ac87764..b9fe389 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd_create01.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd_create01.c
@@ -48,12 +48,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c b/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c
index fa86f28..5f3240b 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c
@@ -57,12 +57,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/timerfd/timerfd_settime01.c b/testcases/kernel/syscalls/timerfd/timerfd_settime01.c
index 1c47195..2e65d23 100644
--- a/testcases/kernel/syscalls/timerfd/timerfd_settime01.c
+++ b/testcases/kernel/syscalls/timerfd/timerfd_settime01.c
@@ -61,12 +61,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/times/times01.c b/testcases/kernel/syscalls/times/times01.c
index 265941f..293a529 100644
--- a/testcases/kernel/syscalls/times/times01.c
+++ b/testcases/kernel/syscalls/times/times01.c
@@ -127,10 +127,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/times/times03.c b/testcases/kernel/syscalls/times/times03.c
index 24bb61c..9234a63 100644
--- a/testcases/kernel/syscalls/times/times03.c
+++ b/testcases/kernel/syscalls/times/times03.c
@@ -67,15 +67,12 @@
int main(int argc, char **argv)
{
- const char *msg;
-
struct tms buf1, buf2;
time_t start_time, end_time;
int pid2, status;
struct sigaction sa;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/tkill/tkill01.c b/testcases/kernel/syscalls/tkill/tkill01.c
index 6e21ba0..d4100dc 100644
--- a/testcases/kernel/syscalls/tkill/tkill01.c
+++ b/testcases/kernel/syscalls/tkill/tkill01.c
@@ -78,10 +78,8 @@
{
int tid;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/truncate/truncate01.c b/testcases/kernel/syscalls/truncate/truncate01.c
index 190997a..68e2e49 100644
--- a/testcases/kernel/syscalls/truncate/truncate01.c
+++ b/testcases/kernel/syscalls/truncate/truncate01.c
@@ -94,14 +94,9 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc;
- const char *msg;
off_t file_length; /* test file length */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/truncate/truncate02.c b/testcases/kernel/syscalls/truncate/truncate02.c
index 82fdfcc..6b26fa8 100644
--- a/testcases/kernel/syscalls/truncate/truncate02.c
+++ b/testcases/kernel/syscalls/truncate/truncate02.c
@@ -97,18 +97,13 @@
{
struct stat stat_buf; /* stat(2) struct contents */
int lc, i;
- const char *msg;
off_t file_length2; /* test file length */
off_t file_length1; /* test file length */
int rbytes; /* bytes read from testfile */
int read_len = 0; /* total no. of bytes read from testfile */
int err_flag = 0; /* error indicator flag */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/truncate/truncate03.c b/testcases/kernel/syscalls/truncate/truncate03.c
index dd5ad49..e8fdae3 100644
--- a/testcases/kernel/syscalls/truncate/truncate03.c
+++ b/testcases/kernel/syscalls/truncate/truncate03.c
@@ -97,11 +97,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ulimit/ulimit01.c b/testcases/kernel/syscalls/ulimit/ulimit01.c
index f4a24ca..74dea91 100644
--- a/testcases/kernel/syscalls/ulimit/ulimit01.c
+++ b/testcases/kernel/syscalls/ulimit/ulimit01.c
@@ -154,7 +154,6 @@
{
int lc;
int i;
- const char *msg;
int tmp;
TST_TOTAL = sizeof(Scenarios) / sizeof(struct limits_t);
@@ -162,9 +161,7 @@
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/umask/umask01.c b/testcases/kernel/syscalls/umask/umask01.c
index 88e2fd1..8f0b60a 100644
--- a/testcases/kernel/syscalls/umask/umask01.c
+++ b/testcases/kernel/syscalls/umask/umask01.c
@@ -125,10 +125,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/umask/umask02.c b/testcases/kernel/syscalls/umask/umask02.c
index 7e83796..0ba797c 100644
--- a/testcases/kernel/syscalls/umask/umask02.c
+++ b/testcases/kernel/syscalls/umask/umask02.c
@@ -61,14 +61,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int uret = 0, i, mskval = 0000;
int failcnt = 0;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/umask/umask03.c b/testcases/kernel/syscalls/umask/umask03.c
index 9e2ed24..e10009c 100644
--- a/testcases/kernel/syscalls/umask/umask03.c
+++ b/testcases/kernel/syscalls/umask/umask03.c
@@ -64,7 +64,6 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
struct stat statbuf;
int mskval = 0000;
@@ -72,8 +71,7 @@
int fildes, i;
unsigned low9mode;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/umount/umount01.c b/testcases/kernel/syscalls/umount/umount01.c
index cc677b7..3c25b56 100644
--- a/testcases/kernel/syscalls/umount/umount01.c
+++ b/testcases/kernel/syscalls/umount/umount01.c
@@ -42,10 +42,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/umount/umount02.c b/testcases/kernel/syscalls/umount/umount02.c
index 1130030..7f172f4 100644
--- a/testcases/kernel/syscalls/umount/umount02.c
+++ b/testcases/kernel/syscalls/umount/umount02.c
@@ -71,10 +71,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)))
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/umount/umount03.c b/testcases/kernel/syscalls/umount/umount03.c
index 03a8be0..8d87ddd 100644
--- a/testcases/kernel/syscalls/umount/umount03.c
+++ b/testcases/kernel/syscalls/umount/umount03.c
@@ -53,10 +53,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/uname/uname01.c b/testcases/kernel/syscalls/uname/uname01.c
index 3c3af98..6b4e655 100644
--- a/testcases/kernel/syscalls/uname/uname01.c
+++ b/testcases/kernel/syscalls/uname/uname01.c
@@ -126,10 +126,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/uname/uname02.c b/testcases/kernel/syscalls/uname/uname02.c
index e6e59e3..8b45a76 100644
--- a/testcases/kernel/syscalls/uname/uname02.c
+++ b/testcases/kernel/syscalls/uname/uname02.c
@@ -67,10 +67,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/uname/uname03.c b/testcases/kernel/syscalls/uname/uname03.c
index 21dc3ab..2f6292f 100644
--- a/testcases/kernel/syscalls/uname/uname03.c
+++ b/testcases/kernel/syscalls/uname/uname03.c
@@ -68,12 +68,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct utsname *buf;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup(); /* global setup */
diff --git a/testcases/kernel/syscalls/unlink/unlink05.c b/testcases/kernel/syscalls/unlink/unlink05.c
index 184d0ef..f0be94c 100644
--- a/testcases/kernel/syscalls/unlink/unlink05.c
+++ b/testcases/kernel/syscalls/unlink/unlink05.c
@@ -129,13 +129,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/unlink/unlink06.c b/testcases/kernel/syscalls/unlink/unlink06.c
index ede348a..174794d 100644
--- a/testcases/kernel/syscalls/unlink/unlink06.c
+++ b/testcases/kernel/syscalls/unlink/unlink06.c
@@ -133,15 +133,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/unlink/unlink07.c b/testcases/kernel/syscalls/unlink/unlink07.c
index 25ca4de..d5ce6a3 100644
--- a/testcases/kernel/syscalls/unlink/unlink07.c
+++ b/testcases/kernel/syscalls/unlink/unlink07.c
@@ -170,7 +170,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *fname;
char *desc;
int ind;
@@ -178,9 +177,7 @@
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/unlink/unlink08.c b/testcases/kernel/syscalls/unlink/unlink08.c
index d87423e..8539d6a 100644
--- a/testcases/kernel/syscalls/unlink/unlink08.c
+++ b/testcases/kernel/syscalls/unlink/unlink08.c
@@ -158,7 +158,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
char *fname;
char *desc;
int ind;
@@ -166,9 +165,7 @@
/***************************************************************
* parse standard options
***************************************************************/
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
/***************************************************************
* perform global setup for test
diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
index ab255aa..31fe4e7 100644
--- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
@@ -78,7 +78,6 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
/* Disable test if the version of the kernel is less than 2.6.16 */
@@ -88,8 +87,7 @@
exit(0);
}
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/unshare/unshare01.c b/testcases/kernel/syscalls/unshare/unshare01.c
index bc94b76..17a5a5f 100644
--- a/testcases/kernel/syscalls/unshare/unshare01.c
+++ b/testcases/kernel/syscalls/unshare/unshare01.c
@@ -155,10 +155,8 @@
pid_t pid1;
int lc;
int rval;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/unshare/unshare02.c b/testcases/kernel/syscalls/unshare/unshare02.c
index 2a9d80b..d3e303e 100644
--- a/testcases/kernel/syscalls/unshare/unshare02.c
+++ b/testcases/kernel/syscalls/unshare/unshare02.c
@@ -120,10 +120,8 @@
pid_t pid1;
int lc;
int rval;
- const char *msg; /* message TEST_RETURNurned from parse_opts */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c
index 6838550..053ab75 100644
--- a/testcases/kernel/syscalls/ustat/ustat01.c
+++ b/testcases/kernel/syscalls/ustat/ustat01.c
@@ -39,10 +39,8 @@
int main(int argc, char *argv[])
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
index 0569ea4..c76bd52 100644
--- a/testcases/kernel/syscalls/ustat/ustat02.c
+++ b/testcases/kernel/syscalls/ustat/ustat02.c
@@ -56,10 +56,8 @@
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c
index b1c325c..8ff1e3c 100644
--- a/testcases/kernel/syscalls/utime/utime01.c
+++ b/testcases/kernel/syscalls/utime/utime01.c
@@ -99,15 +99,10 @@
struct stat stat_buf; /* struct buffer to hold file info. */
int lc;
long type;
- const char *msg;
time_t modf_time, access_time;
time_t pres_time; /* file modification/access/present time */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c
index 613a7d8..2c93a04 100644
--- a/testcases/kernel/syscalls/utime/utime02.c
+++ b/testcases/kernel/syscalls/utime/utime02.c
@@ -105,15 +105,10 @@
struct stat stat_buf; /* struct buffer to hold file info. */
int lc;
long type;
- const char *msg;
time_t modf_time, access_time;
time_t pres_time; /* file modification/access/present time */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c
index eb78d54..b609e23 100644
--- a/testcases/kernel/syscalls/utime/utime03.c
+++ b/testcases/kernel/syscalls/utime/utime03.c
@@ -114,16 +114,11 @@
struct stat stat_buf; /* struct buffer to hold file info. */
int lc;
long type;
- const char *msg;
time_t modf_time, access_time;
time_t pres_time; /* file modification/access/present time */
pid_t pid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utime/utime04.c b/testcases/kernel/syscalls/utime/utime04.c
index 7e3b02b..11dcd00 100644
--- a/testcases/kernel/syscalls/utime/utime04.c
+++ b/testcases/kernel/syscalls/utime/utime04.c
@@ -97,15 +97,10 @@
{
struct stat stat_buf; /* struct buffer to hold file info. */
int lc;
- const char *msg;
time_t modf_time, access_time;
/* file modification/access time */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utime/utime05.c b/testcases/kernel/syscalls/utime/utime05.c
index ae6da69..baa7ca4 100644
--- a/testcases/kernel/syscalls/utime/utime05.c
+++ b/testcases/kernel/syscalls/utime/utime05.c
@@ -103,15 +103,10 @@
{
struct stat stat_buf; /* struct buffer to hold file info. */
int lc;
- const char *msg;
time_t modf_time, access_time;
/* file modification/access time */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utime/utime06.c b/testcases/kernel/syscalls/utime/utime06.c
index 41a6e12..6e666b2 100644
--- a/testcases/kernel/syscalls/utime/utime06.c
+++ b/testcases/kernel/syscalls/utime/utime06.c
@@ -84,12 +84,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
int i;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/utimes/utimes01.c b/testcases/kernel/syscalls/utimes/utimes01.c
index aa161ac..ec9a4f4 100644
--- a/testcases/kernel/syscalls/utimes/utimes01.c
+++ b/testcases/kernel/syscalls/utimes/utimes01.c
@@ -94,11 +94,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/vfork/vfork01.c b/testcases/kernel/syscalls/vfork/vfork01.c
index dba8bea..b050776 100644
--- a/testcases/kernel/syscalls/vfork/vfork01.c
+++ b/testcases/kernel/syscalls/vfork/vfork01.c
@@ -107,15 +107,10 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t cpid; /* process id of the child process */
int exit_status; /* exit status of child process */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/vfork/vfork02.c b/testcases/kernel/syscalls/vfork/vfork02.c
index 721a4c5..8ba75f8 100644
--- a/testcases/kernel/syscalls/vfork/vfork02.c
+++ b/testcases/kernel/syscalls/vfork/vfork02.c
@@ -89,16 +89,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t cpid; /* process id of the child process */
int exit_status; /* exit status of child process */
sigset_t PendSig; /* variable to hold pending signal */
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/vhangup/vhangup01.c b/testcases/kernel/syscalls/vhangup/vhangup01.c
index 29dff0d..6eda57b 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup01.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup01.c
@@ -39,13 +39,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
pid_t pid;
int retval;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/vhangup/vhangup02.c b/testcases/kernel/syscalls/vhangup/vhangup02.c
index 368612d..136b268 100644
--- a/testcases/kernel/syscalls/vhangup/vhangup02.c
+++ b/testcases/kernel/syscalls/vhangup/vhangup02.c
@@ -58,14 +58,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
pid_t pid, pid1;
int status;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
index cdaf67b..a9d7d77 100644
--- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c
+++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c
@@ -56,10 +56,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice02.c b/testcases/kernel/syscalls/vmsplice/vmsplice02.c
index cc87ebe..4468294 100644
--- a/testcases/kernel/syscalls/vmsplice/vmsplice02.c
+++ b/testcases/kernel/syscalls/vmsplice/vmsplice02.c
@@ -71,11 +71,8 @@
int main(int ac, char **av)
{
int i, lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/wait/wait01.c b/testcases/kernel/syscalls/wait/wait01.c
index 0f5514f..bd22c11 100644
--- a/testcases/kernel/syscalls/wait/wait01.c
+++ b/testcases/kernel/syscalls/wait/wait01.c
@@ -36,11 +36,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/wait/wait02.c b/testcases/kernel/syscalls/wait/wait02.c
index a35e829..5695c07 100644
--- a/testcases/kernel/syscalls/wait/wait02.c
+++ b/testcases/kernel/syscalls/wait/wait02.c
@@ -52,11 +52,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/wait4/wait401.c b/testcases/kernel/syscalls/wait4/wait401.c
index 39e62a8..26a5c70 100644
--- a/testcases/kernel/syscalls/wait4/wait401.c
+++ b/testcases/kernel/syscalls/wait4/wait401.c
@@ -40,13 +40,11 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t pid;
int status = 1;
struct rusage rusage;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/wait4/wait402.c b/testcases/kernel/syscalls/wait4/wait402.c
index cc3ae50..39b1702 100644
--- a/testcases/kernel/syscalls/wait4/wait402.c
+++ b/testcases/kernel/syscalls/wait4/wait402.c
@@ -50,14 +50,12 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
pid_t epid = get_pid_max() + 1;
int status = 1;
struct rusage rusage;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/waitid/waitid01.c b/testcases/kernel/syscalls/waitid/waitid01.c
index 4f0a0da..c19f0da 100644
--- a/testcases/kernel/syscalls/waitid/waitid01.c
+++ b/testcases/kernel/syscalls/waitid/waitid01.c
@@ -120,11 +120,8 @@
id_t pid;
siginfo_t infop;
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/waitid/waitid02.c b/testcases/kernel/syscalls/waitid/waitid02.c
index e6c62bb..b72e25e 100644
--- a/testcases/kernel/syscalls/waitid/waitid02.c
+++ b/testcases/kernel/syscalls/waitid/waitid02.c
@@ -285,11 +285,8 @@
int main(int ac, char **av)
{
int lc, testno;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
for (lc = 0; TEST_LOOPING(lc); ++lc) {
diff --git a/testcases/kernel/syscalls/waitpid/waitpid01.c b/testcases/kernel/syscalls/waitpid/waitpid01.c
index 38031ac..e05e783 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid01.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid01.c
@@ -60,14 +60,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int pid, npid, sig, nsig;
int exno, nexno, status;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/waitpid/waitpid02.c b/testcases/kernel/syscalls/waitpid/waitpid02.c
index 8494866..e5d7957 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid02.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid02.c
@@ -67,14 +67,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int pid, npid, sig, nsig;
int exno, nexno, status;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "");
#endif
diff --git a/testcases/kernel/syscalls/waitpid/waitpid03.c b/testcases/kernel/syscalls/waitpid/waitpid03.c
index 3559156..2599a92 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid03.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid03.c
@@ -74,13 +74,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int status, pid[25], ret;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child, "d", &ikids_uclinux);
#endif
diff --git a/testcases/kernel/syscalls/waitpid/waitpid04.c b/testcases/kernel/syscalls/waitpid/waitpid04.c
index 87f8185..abf94ee 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid04.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid04.c
@@ -62,11 +62,8 @@
int pid, status, ret;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/waitpid/waitpid05.c b/testcases/kernel/syscalls/waitpid/waitpid05.c
index 509daf9..5466fd9 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid05.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid05.c
@@ -78,11 +78,8 @@
int pid, npid, sig, nsig;
int exno, nexno, status;
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_child_uclinux, "d", &sig_uclinux);
diff --git a/testcases/kernel/syscalls/waitpid/waitpid06.c b/testcases/kernel/syscalls/waitpid/waitpid06.c
index faa62b6..dbbc104 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid06.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid06.c
@@ -74,14 +74,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int fail = 0;
int pid;
int status;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/waitpid/waitpid07.c b/testcases/kernel/syscalls/waitpid/waitpid07.c
index 15d5fae..92f921d 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid07.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid07.c
@@ -75,15 +75,12 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int status;
int fail = 0;
int pid;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/waitpid/waitpid08.c b/testcases/kernel/syscalls/waitpid/waitpid08.c
index cd7c5cf..b2e9e9b 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid08.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid08.c
@@ -74,14 +74,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int status;
int pid;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
argv0 = argv[0];
diff --git a/testcases/kernel/syscalls/waitpid/waitpid09.c b/testcases/kernel/syscalls/waitpid/waitpid09.c
index 68db9c7..1339c82 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid09.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid09.c
@@ -79,13 +79,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int fail, pid, status, ret;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_exit_uclinux, "");
diff --git a/testcases/kernel/syscalls/waitpid/waitpid10.c b/testcases/kernel/syscalls/waitpid/waitpid10.c
index 933086c..6378ab9 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid10.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid10.c
@@ -96,11 +96,8 @@
int runtime; /* time(sec) to run this process */
int lc;
- const char *msg;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
argv0 = av[0];
diff --git a/testcases/kernel/syscalls/waitpid/waitpid11.c b/testcases/kernel/syscalls/waitpid/waitpid11.c
index ae1acc4..4b662d5 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid11.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid11.c
@@ -67,17 +67,13 @@
int main(int ac, char **av)
{
- const char *msg;
-
int kid_count, ret_val, status;
int i, j, k, found;
int group1, group2;
int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS];
int pid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_exit_uclinux, "");
diff --git a/testcases/kernel/syscalls/waitpid/waitpid12.c b/testcases/kernel/syscalls/waitpid/waitpid12.c
index a692c62..bf64662 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid12.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid12.c
@@ -68,17 +68,13 @@
int main(int argc, char **argv)
{
- const char *msg;
-
int kid_count, ret_val, status;
int i, j, k, found;
int group1, group2;
int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS];
int pid;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_exit_uclinux, "");
diff --git a/testcases/kernel/syscalls/waitpid/waitpid13.c b/testcases/kernel/syscalls/waitpid/waitpid13.c
index f161bc8..5f03592 100644
--- a/testcases/kernel/syscalls/waitpid/waitpid13.c
+++ b/testcases/kernel/syscalls/waitpid/waitpid13.c
@@ -68,17 +68,13 @@
int main(int ac, char **av)
{
- const char *msg;
-
int kid_count, ret_val, status;
int i, j, k, found;
int group1, group2;
int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS];
int pid;
- msg = parse_opts(ac, av, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
#ifdef UCLINUX
maybe_run_child(&do_exit_uclinux, "");
diff --git a/testcases/kernel/syscalls/write/write01.c b/testcases/kernel/syscalls/write/write01.c
index 75edf2c..c183e99 100644
--- a/testcases/kernel/syscalls/write/write01.c
+++ b/testcases/kernel/syscalls/write/write01.c
@@ -134,10 +134,8 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/write/write02.c b/testcases/kernel/syscalls/write/write02.c
index a9c02af..4924422 100644
--- a/testcases/kernel/syscalls/write/write02.c
+++ b/testcases/kernel/syscalls/write/write02.c
@@ -64,7 +64,6 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int cwrite;
int fild;
@@ -72,9 +71,7 @@
int badcount = 0;
char pwbuf[BUFSIZ + 1];
- if ((msg = parse_opts(argc, argv, NULL, NULL))) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup(); /* global setup for test */
diff --git a/testcases/kernel/syscalls/write/write03.c b/testcases/kernel/syscalls/write/write03.c
index 99a4312..63ef35a 100644
--- a/testcases/kernel/syscalls/write/write03.c
+++ b/testcases/kernel/syscalls/write/write03.c
@@ -69,14 +69,11 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
char wbuf[BUFSIZ], rbuf[BUFSIZ];
int fd;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
/* global setup */
setup();
diff --git a/testcases/kernel/syscalls/write/write04.c b/testcases/kernel/syscalls/write/write04.c
index 95ba7a6..d6a5146 100644
--- a/testcases/kernel/syscalls/write/write04.c
+++ b/testcases/kernel/syscalls/write/write04.c
@@ -69,7 +69,6 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
struct stat buf;
int fail;
@@ -77,9 +76,7 @@
char wbuf[17 * PIPE_SIZE_TEST];
struct sigaction sigptr; /* set up signal handler */
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
/* global setup */
setup();
diff --git a/testcases/kernel/syscalls/write/write05.c b/testcases/kernel/syscalls/write/write05.c
index a8c8cc4..2969773 100644
--- a/testcases/kernel/syscalls/write/write05.c
+++ b/testcases/kernel/syscalls/write/write05.c
@@ -74,15 +74,12 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
char pbuf[BUFSIZ];
int pipefildes[2];
int status, pid;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
/* global setup */
setup();
diff --git a/testcases/kernel/syscalls/writev/writev01.c b/testcases/kernel/syscalls/writev/writev01.c
index f077cea..bfa5bba 100644
--- a/testcases/kernel/syscalls/writev/writev01.c
+++ b/testcases/kernel/syscalls/writev/writev01.c
@@ -128,10 +128,8 @@
int nbytes, ret;
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/writev/writev02.c b/testcases/kernel/syscalls/writev/writev02.c
index 2b8e11a..60d9e89 100644
--- a/testcases/kernel/syscalls/writev/writev02.c
+++ b/testcases/kernel/syscalls/writev/writev02.c
@@ -92,12 +92,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int nbytes;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/writev/writev03.c b/testcases/kernel/syscalls/writev/writev03.c
index 8015c0a..e5cdf4b 100644
--- a/testcases/kernel/syscalls/writev/writev03.c
+++ b/testcases/kernel/syscalls/writev/writev03.c
@@ -87,12 +87,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int nbytes;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/syscalls/writev/writev04.c b/testcases/kernel/syscalls/writev/writev04.c
index 86fca8d..954b1fa 100644
--- a/testcases/kernel/syscalls/writev/writev04.c
+++ b/testcases/kernel/syscalls/writev/writev04.c
@@ -90,14 +90,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int nbytes;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup(); /* set "tstdir", and "testfile" vars */
diff --git a/testcases/kernel/syscalls/writev/writev05.c b/testcases/kernel/syscalls/writev/writev05.c
index c0a7995..910fa23 100644
--- a/testcases/kernel/syscalls/writev/writev05.c
+++ b/testcases/kernel/syscalls/writev/writev05.c
@@ -89,13 +89,10 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
int nbytes;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup(); /* set "tstdir", and "testfile" vars */
diff --git a/testcases/kernel/syscalls/writev/writev06.c b/testcases/kernel/syscalls/writev/writev06.c
index 583ea9b..6fe7206 100644
--- a/testcases/kernel/syscalls/writev/writev06.c
+++ b/testcases/kernel/syscalls/writev/writev06.c
@@ -78,12 +78,8 @@
int main(int argc, char **argv)
{
int lc;
- const char *msg;
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup(); /* set "tstdir", and "testfile" vars */
diff --git a/testcases/kernel/timers/clock_gettime/clock_gettime02.c b/testcases/kernel/timers/clock_gettime/clock_gettime02.c
index de3ad24..e68a207 100644
--- a/testcases/kernel/timers/clock_gettime/clock_gettime02.c
+++ b/testcases/kernel/timers/clock_gettime/clock_gettime02.c
@@ -80,11 +80,9 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
struct timespec spec;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/clock_gettime/clock_gettime03.c b/testcases/kernel/timers/clock_gettime/clock_gettime03.c
index eb8ba9f..2194d10 100644
--- a/testcases/kernel/timers/clock_gettime/clock_gettime03.c
+++ b/testcases/kernel/timers/clock_gettime/clock_gettime03.c
@@ -89,8 +89,7 @@
int main(int ac, char **av)
{
- int i, lc; /* loop counter */
- const char *msg;
+ int i, lc;
struct timespec spec, *temp;
clockid_t clocks[] = {
@@ -102,8 +101,7 @@
CLOCK_THREAD_CPUTIME_ID
};
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
/*
* PROCESS_CPUTIME_ID & THREAD_CPUTIME_ID are not supported on
diff --git a/testcases/kernel/timers/clock_settime/clock_settime02.c b/testcases/kernel/timers/clock_settime/clock_settime02.c
index 996fb6c..9873990 100644
--- a/testcases/kernel/timers/clock_settime/clock_settime02.c
+++ b/testcases/kernel/timers/clock_settime/clock_settime02.c
@@ -81,11 +81,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
struct timespec spec; /* Used to specify time for test */
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/clock_settime/clock_settime03.c b/testcases/kernel/timers/clock_settime/clock_settime03.c
index 769849e..f76b610 100644
--- a/testcases/kernel/timers/clock_settime/clock_settime03.c
+++ b/testcases/kernel/timers/clock_settime/clock_settime03.c
@@ -62,10 +62,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/leapsec/leapsec_timer.c b/testcases/kernel/timers/leapsec/leapsec_timer.c
index be9675d..9af6882 100644
--- a/testcases/kernel/timers/leapsec/leapsec_timer.c
+++ b/testcases/kernel/timers/leapsec/leapsec_timer.c
@@ -48,12 +48,9 @@
int main(int argc, char **argv)
{
- const char *msg;
int lc;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/timer_create/timer_create02.c b/testcases/kernel/timers/timer_create/timer_create02.c
index f71499d..7f528ed 100644
--- a/testcases/kernel/timers/timer_create/timer_create02.c
+++ b/testcases/kernel/timers/timer_create/timer_create02.c
@@ -81,8 +81,7 @@
int main(int ac, char **av)
{
- int lc, i, j; /* loop counter */
- const char *msg;
+ int lc, i, j;
kernel_timer_t created_timer_id; /* holds the returned timer_id */
char *message[3] = {
"SIGEV_SIGNAL",
@@ -91,8 +90,7 @@
};
const char *mrstr = "MONOTONIC_RAW";
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c
index 23dbe7c..291fcfa 100644
--- a/testcases/kernel/timers/timer_create/timer_create03.c
+++ b/testcases/kernel/timers/timer_create/timer_create03.c
@@ -90,7 +90,6 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
kernel_timer_t created_timer_id; /* holds the returned timer_id */
char *message[] = {
"SIGEV_SIGNAL",
@@ -98,9 +97,7 @@
"SIGEV_NONE"
};
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/timer_create/timer_create04.c b/testcases/kernel/timers/timer_create/timer_create04.c
index ad1adfd..11cfc21 100644
--- a/testcases/kernel/timers/timer_create/timer_create04.c
+++ b/testcases/kernel/timers/timer_create/timer_create04.c
@@ -99,7 +99,6 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
kernel_timer_t timer_id, *temp_id; /* stores the returned timer_id */
struct sigevent *temp_ev; /* used for bad address test case */
@@ -112,8 +111,7 @@
CLOCK_THREAD_CPUTIME_ID
};
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(ac, av, NULL, NULL);
TST_TOTAL = sizeof(testcase) / sizeof(testcase[0]);
diff --git a/testcases/kernel/timers/timer_delete/timer_delete02.c b/testcases/kernel/timers/timer_delete/timer_delete02.c
index dada4ed..b9b9c7f 100644
--- a/testcases/kernel/timers/timer_delete/timer_delete02.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete02.c
@@ -80,12 +80,9 @@
int main(int ac, char **av)
{
int lc;
- const char *msg;
kernel_timer_t timer_id;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/timer_delete/timer_delete03.c b/testcases/kernel/timers/timer_delete/timer_delete03.c
index 275f71b..02506fb 100644
--- a/testcases/kernel/timers/timer_delete/timer_delete03.c
+++ b/testcases/kernel/timers/timer_delete/timer_delete03.c
@@ -86,12 +86,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/timer_settime/timer_settime02.c b/testcases/kernel/timers/timer_settime/timer_settime02.c
index 573cc5f..cfeb7b3 100644
--- a/testcases/kernel/timers/timer_settime/timer_settime02.c
+++ b/testcases/kernel/timers/timer_settime/timer_settime02.c
@@ -85,11 +85,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/kernel/timers/timer_settime/timer_settime03.c b/testcases/kernel/timers/timer_settime/timer_settime03.c
index a7e081c..1216c11 100644
--- a/testcases/kernel/timers/timer_settime/timer_settime03.c
+++ b/testcases/kernel/timers/timer_settime/timer_settime03.c
@@ -93,12 +93,8 @@
int main(int ac, char **av)
{
int lc, i;
- const char *msg;
- if ((msg = parse_opts(ac, av, NULL, NULL))
- != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(ac, av, NULL, NULL);
setup();
diff --git a/testcases/misc/crash/crash01.c b/testcases/misc/crash/crash01.c
index cbbc3f9..0574521 100644
--- a/testcases/misc/crash/crash01.c
+++ b/testcases/misc/crash/crash01.c
@@ -149,11 +149,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- if ((msg = parse_opts(argc, argv, options, help)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (v_opt)
verbose_level = atoi(v_copt);
diff --git a/testcases/misc/crash/crash02.c b/testcases/misc/crash/crash02.c
index ca73fd0..00fee34 100644
--- a/testcases/misc/crash/crash02.c
+++ b/testcases/misc/crash/crash02.c
@@ -138,11 +138,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- if ((msg = parse_opts(argc, argv, options, help)) != NULL)
- tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, options, help);
if (v_opt)
verbose_level = atoi(v_copt);
diff --git a/testcases/network/lib6/asapi_01.c b/testcases/network/lib6/asapi_01.c
index d53ce23..5d8bdc7 100644
--- a/testcases/network/lib6/asapi_01.c
+++ b/testcases/network/lib6/asapi_01.c
@@ -206,11 +206,8 @@
int main(int argc, char *argv[])
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/asapi_02.c b/testcases/network/lib6/asapi_02.c
index d195d9c..01bee37 100644
--- a/testcases/network/lib6/asapi_02.c
+++ b/testcases/network/lib6/asapi_02.c
@@ -293,11 +293,8 @@
int main(int argc, char *argv[])
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/asapi_03.c b/testcases/network/lib6/asapi_03.c
index 741c06b..f458d7d 100644
--- a/testcases/network/lib6/asapi_03.c
+++ b/testcases/network/lib6/asapi_03.c
@@ -189,11 +189,8 @@
int main(int argc, char *argv[])
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/asapi_04.c b/testcases/network/lib6/asapi_04.c
index 6f2fa2d..76de26b 100644
--- a/testcases/network/lib6/asapi_04.c
+++ b/testcases/network/lib6/asapi_04.c
@@ -78,14 +78,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- /* Parse standard options given to run the test. */
- msg = parse_opts(argc, argv, 0, 0);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, 0, 0);
pid = getpid();
diff --git a/testcases/network/lib6/asapi_05.c b/testcases/network/lib6/asapi_05.c
index 8efbadb..9acc6a2 100644
--- a/testcases/network/lib6/asapi_05.c
+++ b/testcases/network/lib6/asapi_05.c
@@ -60,11 +60,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
/* Parse standard options given to run the test. */
- if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/asapi_06.c b/testcases/network/lib6/asapi_06.c
index 0693e3a..960ebb5 100644
--- a/testcases/network/lib6/asapi_06.c
+++ b/testcases/network/lib6/asapi_06.c
@@ -79,14 +79,9 @@
int main(int argc, char *argv[])
{
- const char *msg;
int lc;
- /* Parse standard options given to run the test. */
- msg = parse_opts(argc, argv, 0, 0);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
pid = getpid();
@@ -96,7 +91,6 @@
do_tests();
cleanup();
-
tst_exit();
}
diff --git a/testcases/network/lib6/asapi_07.c b/testcases/network/lib6/asapi_07.c
index 758c707..826cea6 100644
--- a/testcases/network/lib6/asapi_07.c
+++ b/testcases/network/lib6/asapi_07.c
@@ -94,11 +94,8 @@
int main(int argc, char *argv[])
{
int i, lc;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/getaddrinfo_01.c b/testcases/network/lib6/getaddrinfo_01.c
index fe5ad78..ec29b5d 100644
--- a/testcases/network/lib6/getaddrinfo_01.c
+++ b/testcases/network/lib6/getaddrinfo_01.c
@@ -69,13 +69,9 @@
int main(int argc, char *argv[])
{
int lc;
- const char *msg;
/* Parse standard options given to run the test. */
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/in6_01.c b/testcases/network/lib6/in6_01.c
index 027e287..f7186b4 100644
--- a/testcases/network/lib6/in6_01.c
+++ b/testcases/network/lib6/in6_01.c
@@ -76,12 +76,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/lib6/in6_02.c b/testcases/network/lib6/in6_02.c
index 3059023..fea1827 100644
--- a/testcases/network/lib6/in6_02.c
+++ b/testcases/network/lib6/in6_02.c
@@ -58,12 +58,8 @@
{
int lc;
int i;
- const char *msg;
- msg = parse_opts(argc, argv, NULL, NULL);
- if (msg != NULL) {
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
- }
+ tst_parse_opts(argc, argv, NULL, NULL);
setup();
diff --git a/testcases/network/tcp_fastopen/tcp_fastopen.c b/testcases/network/tcp_fastopen/tcp_fastopen.c
index 61262d2..b01ca89 100644
--- a/testcases/network/tcp_fastopen/tcp_fastopen.c
+++ b/testcases/network/tcp_fastopen/tcp_fastopen.c
@@ -689,10 +689,8 @@
static void setup(int argc, char *argv[])
{
- const char *msg;
- msg = parse_opts(argc, argv, options, help);
- if (msg != NULL)
- tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+ tst_parse_opts(argc, argv, options, help);
/* if client_num is not set, use num of processors */
clients_num = sysconf(_SC_NPROCESSORS_ONLN);