public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
From: Li Wang <liwang@redhat.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH V4 6/6] swapoff01: make use of make_swapfile
Date: Wed, 24 Jan 2024 12:45:48 +0800	[thread overview]
Message-ID: <20240124044548.2652626-7-liwang@redhat.com> (raw)
In-Reply-To: <20240124044548.2652626-1-liwang@redhat.com>

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>
Reviewed-by: Petr Vorel <pvorel@suse.cz>
---
 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

  parent reply	other threads:[~2024-01-24  4:47 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-24  4:45 [LTP] [PATCH V4 0/6] improvement work on libswap library Li Wang
2024-01-24  4:45 ` [LTP] [PATCH V4 1/6] libswap: add known swap supported fs check Li Wang
2024-01-24  4:45 ` [LTP] [PATCH V4 2/6] swapon01: Test on all filesystems Li Wang
2024-01-24  4:45 ` [LTP] [PATCH V4 3/6] swapon01: Improving test with memory limits and swap reporting Li Wang
2024-01-24  4:45 ` [LTP] [PATCH V4 4/6] libswap: add function to prealloc contiguous file Li Wang
2024-01-24  4:45 ` [LTP] [PATCH V4 5/6] libswap: Introduce file contiguity check Li Wang
2024-01-24 18:17   ` Petr Vorel
2024-01-24  4:45 ` Li Wang [this message]
2024-01-24 19:22 ` [LTP] [PATCH V4 0/6] improvement work on libswap library Petr Vorel
2024-01-25 10:23   ` Li Wang
2024-01-26  8:26     ` Yang Xu (Fujitsu)
2024-01-26 10:05     ` Cyril Hrubis
2024-01-26 10:34       ` Li Wang
2024-01-26 10:39         ` Petr Vorel
2024-01-26 10:46           ` Cyril Hrubis
2024-01-26 11:29             ` Petr Vorel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240124044548.2652626-7-liwang@redhat.com \
    --to=liwang@redhat.com \
    --cc=ltp@lists.linux.it \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox