[LTP] [PATCH] hugeshmget: Use __func__ instead of hardcoded function

[LTP] [PATCH] hugeshmget: Use __func__ instead of hardcoded function

[“Samir]

Replace hardcoded "setup" string with __func__ in error messages
to follow LTP coding style guidelines(make check).

Fixed in:
- hugeshmget02.c:83
- hugeshmget03.c:76
- hugeshmget05.c:75

Changed from: tst_brk(TBROK | TERRNO, "shmget #setup");
Changed to:   tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

Signed-off-by: “Samir <samir@linux.ibm.com>
---
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +-
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
index bbd968c06..065aa05fc 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
@@ -80,7 +80,7 @@ void setup(void)
 	shm_id_1 = shmget(shmkey, shm_size,
 			  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
 	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 }
 
 void cleanup(void)
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
index 625761f6e..1f07d585a 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
@@ -73,7 +73,7 @@ static void setup(void)
 				  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
 	}
 	if (errno != ENOSPC)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 }
 
 static void cleanup(void)
diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
index 336319603..a2bb9020d 100644
--- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
+++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
@@ -72,7 +72,7 @@ void setup(void)
 	shm_id_1 = shmget(shmkey, shm_size,
 			  SHM_HUGETLB | SHM_RW | IPC_CREAT | IPC_EXCL);
 	if (shm_id_1 == -1)
-		tst_brk(TBROK | TERRNO, "shmget #setup");
+		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
 
 	/* get the userid for a non-root user */
 	ltp_uid = getuserid(ltp_user);
-- 
2.52.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] hugeshmget: Use __func__ instead of hardcoded function

[Cyril Hrubis]

Hi!
> Fixed in:
> - hugeshmget02.c:83
> - hugeshmget03.c:76
> - hugeshmget05.c:75
> 
> Changed from: tst_brk(TBROK | TERRNO, "shmget #setup");
> Changed to:   tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

You should really use SAFE_SHMGET() in the setup() in the 02 and 05
tests instead.

> Signed-off-by: “Samir <samir@linux.ibm.com>
> ---
>  testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +-
>  testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +-
>  testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
> index bbd968c06..065aa05fc 100644
> --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
> +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c
> @@ -80,7 +80,7 @@ void setup(void)
>  	shm_id_1 = shmget(shmkey, shm_size,
>  			  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
>  	if (shm_id_1 == -1)
> -		tst_brk(TBROK | TERRNO, "shmget #setup");
> +		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
>  }
>  
>  void cleanup(void)
> diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
> index 625761f6e..1f07d585a 100644
> --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
> +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c
> @@ -73,7 +73,7 @@ static void setup(void)
>  				  SHM_HUGETLB | IPC_CREAT | IPC_EXCL | SHM_RW);
>  	}
>  	if (errno != ENOSPC)
> -		tst_brk(TBROK | TERRNO, "shmget #setup");
> +		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);

And here you should probably just print tst_brk(TBROK | TERRNO, "shmget()");

There is enough information printed by the tst_brk() to locate the
failure, no need to add more.

>  
>  static void cleanup(void)
> diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
> index 336319603..a2bb9020d 100644
> --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
> +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c
> @@ -72,7 +72,7 @@ void setup(void)
>  	shm_id_1 = shmget(shmkey, shm_size,
>  			  SHM_HUGETLB | SHM_RW | IPC_CREAT | IPC_EXCL);
>  	if (shm_id_1 == -1)
> -		tst_brk(TBROK | TERRNO, "shmget #setup");
> +		tst_brk(TBROK | TERRNO, "shmget #%s", __func__);
>  
>  	/* get the userid for a non-root user */
>  	ltp_uid = getuserid(ltp_user);
> -- 
> 2.52.0
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp