c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: tests: switch mktemp to local helpers

Browse source 
Use the helpers to create temporary files, this save some typing and
we'll have a bit more consistent naming.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-10-11 15:56:58 +02:00
parent d96d143ef2
commit 83c0a82289
12 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/convert-tests/005-delete-all-rollback/test.sh
View file

@ -29,7 +29,7 @@ do_test() {
convert_test_preamble "$features" "$msg" "$nodesize" "$@"
convert_test_prep_fs ext4 "$@"
populate_fs
CHECKSUMTMP=$(mktemp --tmpdir btrfs-progs-convert.XXXXXX)
CHECKSUMTMP=$(_mktemp convert)
convert_test_gen_checksums "$CHECKSUMTMP"
run_check_umount_test_dev

2
tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
View file

@ -32,7 +32,7 @@ do_test() {
convert_test_preamble "$features" "$msg" "$nodesize" "$@"
convert_test_prep_fs reiserfs "$@"
populate_fs
CHECKSUMTMP=$(mktemp --tmpdir btrfs-progs-convert.XXXXXX)
CHECKSUMTMP=$(_mktemp convert)
convert_test_gen_checksums "$CHECKSUMTMP"
run_check_umount_test_dev

2
tests/misc-tests/025-zstd-compression/test.sh
View file

@ -29,7 +29,7 @@ run_check_stdout "$TOP/btrfs" inspect-internal dump-super -f "$image" \
|| _fail "btrfs inspect-internal dump-super no incompat COMPRESS_ZSTD"
# Create a temporary directory and restore the filesystem
restore_tmp=$(mktemp --tmpdir -d btrfs-progs-restore.XXXXXX)
restore_tmp=$(_mktemp_dir restore)
run_check "$TOP/btrfs" restore "$image" "$restore_tmp"
# Expect 3 files

2
tests/misc-tests/048-image-restore-mount/test.sh
View file

@ -10,7 +10,7 @@ check_prereq btrfs
prepare_test_dev
tmp=$(mktemp -d --tmpdir btrfs-progs-image.XXXXXX)
tmp=$(_mktemp_dir image)
run_check_mkfs_test_dev
run_check "$TOP/btrfs-image" "$TEST_DEV" "$tmp/dump"

2
tests/mkfs-tests/001-basic-profiles/test.sh
View file

@ -13,7 +13,7 @@ test_get_info()
{
local tmp_out
tmp_out=$(mktemp --tmpdir btrfs-progs-mkfs-get-info.XXXXXX)
tmp_out=$(_mktemp mkfs-get-info)
run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-super "$dev1"
run_check $SUDO_HELPER "$TOP/btrfs" check "$dev1"

2
tests/mkfs-tests/009-special-files-for-rootdir/test.sh
View file

@ -20,7 +20,7 @@ prepare_test_dev
check_global_prereq mknod
check_global_prereq dd
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
run_check mkdir "$tmp/dir"
run_check mkdir -p "$tmp/dir/in/dir"

4
tests/mkfs-tests/011-rootdir-create-file/test.sh
View file

@ -7,9 +7,9 @@ source "$TEST_TOP/common"
check_prereq mkfs.btrfs
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
# we can't use TEST_DEV, a file is needed
img=$(mktemp btrfs-progs-mkfs-rootdir.XXXXXXX)
img=$(_mktemp mkfs-rootdir)
run_check "$TOP/mkfs.btrfs" -f --rootdir "$INTERNAL_BIN/Documentation/" "$img"
rm -rf -- "$img"

2
tests/mkfs-tests/012-rootdir-no-shrink/test.sh
View file

@ -9,7 +9,7 @@ setup_root_helper
fs_size=$((512 * 1024 * 1024))
bs=$((1024 * 1024))
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
prepare_test_dev "$fs_size"

2
tests/mkfs-tests/014-rootdir-inline-extent/test.sh
View file

@ -8,7 +8,7 @@ check_prereq mkfs.btrfs
prepare_test_dev
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
pagesize=$(getconf PAGESIZE)
create_file()

2
tests/mkfs-tests/016-rootdir-bad-symbolic-link/test.sh
View file

@ -10,7 +10,7 @@ source "$TEST_TOP/common"
check_prereq mkfs.btrfs
prepare_test_dev
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
non_existing="/no/such/file$RANDOM$RANDOM"

2
tests/mkfs-tests/021-rfeatures-quota-rootdir/test.sh
View file

@ -15,7 +15,7 @@ prepare_test_dev
check_global_prereq mknod
check_global_prereq dd
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
run_check mkdir "$tmp/dir"
run_check mkdir -p "$tmp/dir/in/dir"

2
tests/mkfs-tests/022-rootdir-size/test.sh
View file

@ -10,7 +10,7 @@ source "$TEST_TOP/common"
check_prereq mkfs.btrfs
prepare_test_dev
tmp=$(mktemp -d --tmpdir btrfs-progs-mkfs-rootdir.XXXXXX)
tmp=$(_mktemp_dir mkfs-rootdir)
fallocate -l 128M $tmp/large_file