Skip to contentSkip to conversation

Make argument to tst_umount an absolute path

PATCH Superseded Leo Liang 2 participants 2 messages Aug 4, 2021 – Aug 23, 2021

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Leo Liang

author
#0 lore raw

PATCH v6 4/4 Make argument to tst_umount an absolute path

tst_umount only takes mount point as an argument, so modify the argument to an absolute path for tst_umount.

---
 testcases/kernel/fs/quota_remount/quota_remount_test01.sh    | 2 +-
 testcases/kernel/security/integrity/ima/tests/evm_overlay.sh | 2 +-
 testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/fs/quota_remount/quota_remount_test01.sh +1 -1
index e84716c03..1b4bdbb99 100755
@@ -32,7 +32,7 @@ do_setup()
 do_clean()
 {
 	[ "$mounted" ] || return
-	tst_umount $MNTDIR
+	tst_umount $PWD/$MNTDIR
 	mounted=
 }
 
testcases/kernel/security/integrity/ima/tests/evm_overlay.sh +1 -1
index 9d86778b6..23a5ec556 100755
@@ -83,7 +83,7 @@ cleanup()
 {
 	[ -n "$mounted" ] || return 0
 
-	tst_umount $TST_DEVICE
+	tst_umount $TST_MNTPOINT
 
 	TST_DEVICE="$device_backup"
 	TST_FS_TYPE="$fs_type_backup"
testcases/kernel/tracing/dynamic_debug/dynamic_debug01.sh +1 -1
index 7f06c2488..fd5ee06c8 100755
@@ -38,7 +38,7 @@ mount_debugfs()
 		if ! grep -q debugfs /proc/filesystems ; then
 			tst_res TCONF "debugfs not supported"
 		fi
-		DEBUGFS_PATH="./tst_debug"
+		DEBUGFS_PATH="$PWD/tst_debug"
 		mkdir "$DEBUGFS_PATH"
 		if mount -t debugfs xxx "$DEBUGFS_PATH" ; then
 			tst_res TINFO "debugfs mounted at $DEBUGFS_PATH"
Signature · 1 line
2.17.0
#1 lore raw

PATCH v6 4/4 Make argument to tst_umount an absolute path

Hi Leo,

unfortunately not all tests has been fixed.
df01.sh uses tst_umount as a cleanup function with the default TST_MNTPOINT, thus we should change it => I'll comment that in the first patch.

Kind regards,
Petr