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/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();