[LTP] [PATCH v3] statmount09.c: Enable mnt_ns_id for STATMOUNT_MNT_NS_ID

[LTP] [PATCH v3] statmount09.c: Enable mnt_ns_id for STATMOUNT_MNT_NS_ID

[Jack Morgan]

statmount09.c: Enable mnt_ns_id for STATMOUNT_MNT_NS_ID

When HAVE_STATMOUNT_MNT_NS_ID is defined, use mnt_ns_id
for statmount09 test case. Otherswise, use mnt_id.

Fixes: #1260

Signed-off-by: Jack Morgan <jmorgan@naotchy.com>
---
 testcases/kernel/syscalls/statmount/statmount09.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/statmount/statmount09.c b/testcases/kernel/syscalls/statmount/statmount09.c
index 20c76ba24..03f54f2b8 100644
--- a/testcases/kernel/syscalls/statmount/statmount09.c
+++ b/testcases/kernel/syscalls/statmount/statmount09.c
@@ -39,7 +39,11 @@ static void run(void)
 		return;

 	TST_EXP_EQ_LI(st_mount->mask, STATMOUNT_MNT_NS_ID);
-	TST_EXP_EQ_LI(st_mount->mnt_ns_id, mnt_ns_id);
+#if !defined(HAVE_STRUCT_STATMOUNT) || defined(HAVE_STRUCT_STATMOUNT_MNT_NS_ID)
+    TST_EXP_EQ_LI(st_mount->mnt_ns_id, mnt_ns_id);
+#else
+    tst_res(TCONF, "statmount.mnt_ns_id not available in current headers, skipping check");
+#endif
 }

 static void setup(void)
--
2.51.0



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

Re: [LTP] [PATCH v3] statmount09.c: Enable mnt_ns_id for STATMOUNT_MNT_NS_ID

[Cyril Hrubis]

Hi!
Since we are nearing next release I pushed the patch with minor
adjustenments, thanks!

> statmount09.c: Enable mnt_ns_id for STATMOUNT_MNT_NS_ID

I've removed this duplicate line.

> When HAVE_STATMOUNT_MNT_NS_ID is defined, use mnt_ns_id
> for statmount09 test case. Otherswise, use mnt_id.
> 
> Fixes: #1260

Replaced this with a full link to the issue (it's easier to dig things
up that way).

> Signed-off-by: Jack Morgan <jmorgan@naotchy.com>
> ---
>  testcases/kernel/syscalls/statmount/statmount09.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/syscalls/statmount/statmount09.c b/testcases/kernel/syscalls/statmount/statmount09.c
> index 20c76ba24..03f54f2b8 100644
> --- a/testcases/kernel/syscalls/statmount/statmount09.c
> +++ b/testcases/kernel/syscalls/statmount/statmount09.c
> @@ -39,7 +39,11 @@ static void run(void)
>  		return;
> 
>  	TST_EXP_EQ_LI(st_mount->mask, STATMOUNT_MNT_NS_ID);
> -	TST_EXP_EQ_LI(st_mount->mnt_ns_id, mnt_ns_id);
> +#if !defined(HAVE_STRUCT_STATMOUNT) || defined(HAVE_STRUCT_STATMOUNT_MNT_NS_ID)
> +    TST_EXP_EQ_LI(st_mount->mnt_ns_id, mnt_ns_id);
> +#else
> +    tst_res(TCONF, "statmount.mnt_ns_id not available in current headers, skipping check");

Replaced the spaces with tabs, we use tabs in LTP (hint: 'make check'
will print errors and warnings to catch such issues).

And also shortened the line a bit, the ", skipping check" part is
redundand since the message type is TCONF already.

-- 
Cyril Hrubis
chrubis@suse.cz

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