[LTP] [PATCH] swapoff01: make use of make_swapfile

[LTP] [PATCH] swapoff01: make use of make_swapfile

[Li Wang]

This patch updates the swapoff01 test setup by replacing the previous
swapfile creation method with a single call to make_swapfile, which
now creates a contiguous swap file.

This change simplifies the setup and fix failure on TMPDIR on btrfs.

Note: it is a single fix but better applied with behind the libswap updates.

Suggested-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Li Wang <liwang@redhat.com>
---
 testcases/kernel/syscalls/swapoff/swapoff01.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c
index b27eecdad..f36f7f17c 100644
--- a/testcases/kernel/syscalls/swapoff/swapoff01.c
+++ b/testcases/kernel/syscalls/swapoff/swapoff01.c
@@ -44,11 +44,8 @@ static void setup(void)
 		tst_brk(TBROK,
 			"Insufficient disk space to create swap file");
 
-	if (tst_fill_file("swapfile01", 0x00, 1024, 65536))
+	if (make_swapfile("swapfile01", 1))
 		tst_brk(TBROK, "Failed to create file for swap");
-
-	if (system("mkswap swapfile01 > tmpfile 2>&1") != 0)
-		tst_brk(TBROK, "Failed to make swapfile");
 }
 
 static struct tst_test test = {
-- 
2.40.1


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

Re: [LTP] [PATCH] swapoff01: make use of make_swapfile

[Petr Vorel]

Hi Li,

> This patch updates the swapoff01 test setup by replacing the previous
> swapfile creation method with a single call to make_swapfile, which
> now creates a contiguous swap file.

> This change simplifies the setup and fix failure on TMPDIR on btrfs.

> Note: it is a single fix but better applied with behind the libswap updates.

Reviewed-by: Petr Vorel <pvorel@suse.cz>

This fixes issue on SLES. The only problem is that we makes swap partition much
smaller than before (e.g. we loose coverage of testing on big swap).

Kind regards,
Petr

> Suggested-by: Petr Vorel <pvorel@suse.cz>
> Signed-off-by: Li Wang <liwang@redhat.com>
> ---
>  testcases/kernel/syscalls/swapoff/swapoff01.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)

> diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c
> index b27eecdad..f36f7f17c 100644
> --- a/testcases/kernel/syscalls/swapoff/swapoff01.c
> +++ b/testcases/kernel/syscalls/swapoff/swapoff01.c
> @@ -44,11 +44,8 @@ static void setup(void)
>  		tst_brk(TBROK,
>  			"Insufficient disk space to create swap file");

> -	if (tst_fill_file("swapfile01", 0x00, 1024, 65536))
> +	if (make_swapfile("swapfile01", 1))
>  		tst_brk(TBROK, "Failed to create file for swap");
> -
> -	if (system("mkswap swapfile01 > tmpfile 2>&1") != 0)
> -		tst_brk(TBROK, "Failed to make swapfile");
>  }

>  static struct tst_test test = {

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