[LTP] [PATCH v2] quotactl06: Fix tmpdir cleanup if setup() exits early

Martin Doucha mdoucha@suse.cz
Fri Mar 4 11:50:33 CET 2022


When setup() exits with TCONF before USRPATH or TESTDIR1 get created,
cleanup() will trigger TWARN when it tries to delete them. Check whether
the file and directory exists before removing them.

Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---

Changes since v1:
- Also check whether USRPATH exists before deleting it

 testcases/kernel/syscalls/quotactl/quotactl06.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/testcases/kernel/syscalls/quotactl/quotactl06.c b/testcases/kernel/syscalls/quotactl/quotactl06.c
index 8e9a17393..87715237f 100644
--- a/testcases/kernel/syscalls/quotactl/quotactl06.c
+++ b/testcases/kernel/syscalls/quotactl/quotactl06.c
@@ -206,8 +206,11 @@ static void setup(void)
 
 static void cleanup(void)
 {
-	SAFE_UNLINK(USRPATH);
-	SAFE_RMDIR(TESTDIR1);
+	if (!access(USRPATH, F_OK))
+		SAFE_UNLINK(USRPATH);
+
+	if (!access(TESTDIR1, F_OK))
+		SAFE_RMDIR(TESTDIR1);
 }
 
 static struct tst_test test = {
-- 
2.35.1



More information about the ltp mailing list