[LTP] [PATCH RESEND] syscalls/swapon03: do not fail if /proc/swaps is absent

[LTP] [PATCH RESEND] syscalls/swapon03: do not fail if /proc/swaps is absent

[Steve Muckle]

If the /proc/swaps file is absent the test should be skipped due
to incompatible configuration.

Signed-off-by: Steve Muckle <smuckle.linux@gmail.com>
---
 testcases/kernel/syscalls/swapon/swapon03.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
index d3f73b044fe1..955ac247b6a2 100644
--- a/testcases/kernel/syscalls/swapon/swapon03.c
+++ b/testcases/kernel/syscalls/swapon/swapon03.c
@@ -328,6 +328,9 @@ static void setup(void)
 
 	tst_require_root();
 
+	if (access("/proc/swaps", F_OK))
+		tst_brkm(TCONF, NULL, "swap not supported by kernel");
+
 	tst_tmpdir();
 
 	switch ((fs_type = tst_fs_type(cleanup, "."))) {
-- 
2.16.1

[LTP] [PATCH RESEND] syscalls/swapon03: do not fail if /proc/swaps is absent

[Richard Palethorpe]

Hello Steve,

Steve Muckle writes:

> If the /proc/swaps file is absent the test should be skipped due
> to incompatible configuration.
>
> Signed-off-by: Steve Muckle <smuckle.linux@gmail.com>
> ---
>  testcases/kernel/syscalls/swapon/swapon03.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
> index d3f73b044fe1..955ac247b6a2 100644
> --- a/testcases/kernel/syscalls/swapon/swapon03.c
> +++ b/testcases/kernel/syscalls/swapon/swapon03.c
> @@ -328,6 +328,9 @@ static void setup(void)
>  
>  	tst_require_root();
>  
> +	if (access("/proc/swaps", F_OK))
> +		tst_brkm(TCONF, NULL, "swap not supported by kernel");
> +
>  	tst_tmpdir();
>  
>  	switch ((fs_type = tst_fs_type(cleanup, "."))) {

LGTM

-- 
Thank you,
Richard.

[LTP] [PATCH RESEND] syscalls/swapon03: do not fail if /proc/swaps is absent

[Petr Vorel]

Hi,

> If the /proc/swaps file is absent the test should be skipped due
> to incompatible configuration.

> Signed-off-by: Steve Muckle <smuckle.linux@gmail.com>
> ---
>  testcases/kernel/syscalls/swapon/swapon03.c | 3 +++
>  1 file changed, 3 insertions(+)

> diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c
> index d3f73b044fe1..955ac247b6a2 100644
> --- a/testcases/kernel/syscalls/swapon/swapon03.c
> +++ b/testcases/kernel/syscalls/swapon/swapon03.c
> @@ -328,6 +328,9 @@ static void setup(void)

>  	tst_require_root();

> +	if (access("/proc/swaps", F_OK))
> +		tst_brkm(TCONF, NULL, "swap not supported by kernel");
> +
>  	tst_tmpdir();

>  	switch ((fs_type = tst_fs_type(cleanup, "."))) {

Merged, thanks!

BTW I wonder which distros don't have CONFIG_SWAP=y. Some embedded or Android?

Kind regards,
Petr

[LTP] [PATCH RESEND] syscalls/swapon03: do not fail if /proc/swaps is absent

[Steve Muckle]

On Mon, Apr 30, 2018 at 4:20 AM, Petr Vorel <pvorel@suse.cz> wrote:

> BTW I wonder which distros don't have CONFIG_SWAP=y. Some embedded or
> Android?
>

Thanks. Yes the platform in my case is Android, though I could see other
embedded platforms not using swap also.

cheers,
Steve
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20180501/4fcb1c2d/attachment.html>