Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions tests/filesystem/Filesystem.pm
Original file line number Diff line number Diff line change
Expand Up @@ -145,31 +145,37 @@ sub make_fs {
}
}

sub umount_rm {
my ($path) = @_;
system("umount -R -l $path 2>/dev/null");
system("rm -rf $path 2>/dev/null");
}

sub mk_mntpoint_1 {
my ($path) = @_;
system("rm -rf $path/mp1 2>/dev/null");
umount_rm("$path/mp1");
system("mkdir -p $path/mp1 2>/dev/null");
}

sub mk_mntpoint_2 {
my ($path) = @_;
system("rm -rf $path/mp2 2>/dev/null");
umount_rm("$path/mp2");
system("mkdir -p $path/mp2 2>/dev/null");
}

sub cleanup {
my ($base) = @_;
system("rm -rf $base/fstest 2>/dev/null");
system("rm -rf $base/mntpoint 2>/dev/null");
umount_rm("$base/fstest");
umount_rm("$base/mntpoint");
}

sub cleanup1 {
my ( $base, $d ) = @_;
system("udevadm settle");
system("losetup -d $d 2>/dev/null");
system("udevadm settle");
system("rm -rf $base/fstest 2>/dev/null");
system("rm -rf $base/mntpoint 2>/dev/null");
umount_rm("$base/fstest");
umount_rm("$base/mntpoint");
}

# Cleanup any attached /dev/loop entries
Expand Down