From: David Sterba Date: Mon, 12 Mar 2018 18:17:49 +0000 (+0100) Subject: btrfs-progs: tests: fix source path for testsuite X-Git-Tag: upstream/4.16.1~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e875cd98e38f9fdc7f812a7575a3a2afd6b6094b;hp=546cea6f364cb5d51e589186503764595543123a;p=platform%2Fupstream%2Fbtrfs-progs.git btrfs-progs: tests: fix source path for testsuite The commit cebf3b37228cbde730a5 ("btrfs-progs: introduce TEST_TOP and INTERNAL_BIN for tests") did not convert all test paths. This would break the exported testsutie. Signed-off-by: David Sterba --- diff --git a/tests/fsck-tests/015-tree-reloc-tree/test.sh b/tests/fsck-tests/015-tree-reloc-tree/test.sh index afad1e8..21987b0 100755 --- a/tests/fsck-tests/015-tree-reloc-tree/test.sh +++ b/tests/fsck-tests/015-tree-reloc-tree/test.sh @@ -5,7 +5,7 @@ # Also due to the short life span of reloc tree, save the as dump example for # later usage. -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/misc-tests/028-superblock-recover/test.sh b/tests/misc-tests/028-superblock-recover/test.sh index 1175e48..a177e1e 100755 --- a/tests/misc-tests/028-superblock-recover/test.sh +++ b/tests/misc-tests/028-superblock-recover/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # Test that any superblock is correctly detected and fixed by btrfs rescue -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs check_prereq mkfs.btrfs diff --git a/tests/misc-tests/029-send-p-different-mountpoints/test.sh b/tests/misc-tests/029-send-p-different-mountpoints/test.sh index 6a38015..0b42b77 100755 --- a/tests/misc-tests/029-send-p-different-mountpoints/test.sh +++ b/tests/misc-tests/029-send-p-different-mountpoints/test.sh @@ -2,7 +2,7 @@ # test that send -p does not corrupt paths when send is using 2 different mount # points -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs check_prereq mkfs.btrfs diff --git a/tests/mkfs-tests/010-minimal-size/test.sh b/tests/mkfs-tests/010-minimal-size/test.sh index 62f8e16..582533c 100755 --- a/tests/mkfs-tests/010-minimal-size/test.sh +++ b/tests/mkfs-tests/010-minimal-size/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # test if the reported minimal size of mkfs.btrfs is valid -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs diff --git a/tests/mkfs-tests/011-rootdir-create-file/test.sh b/tests/mkfs-tests/011-rootdir-create-file/test.sh index c04f711..20f7c4c 100755 --- a/tests/mkfs-tests/011-rootdir-create-file/test.sh +++ b/tests/mkfs-tests/011-rootdir-create-file/test.sh @@ -3,7 +3,7 @@ # Expected behavior: it should create a new file if destination doesn't exist # Regression 460e93f25754 ("btrfs-progs: mkfs: check the status of file at mkfs") -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs diff --git a/tests/mkfs-tests/012-rootdir-no-shrink/test.sh b/tests/mkfs-tests/012-rootdir-no-shrink/test.sh index c1cb04f..045906a 100755 --- a/tests/mkfs-tests/012-rootdir-no-shrink/test.sh +++ b/tests/mkfs-tests/012-rootdir-no-shrink/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # Test if mkfs.btrfs --rootdir will skip shrinking correctly -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs diff --git a/tests/mkfs-tests/013-reserved-1M-for-single/test.sh b/tests/mkfs-tests/013-reserved-1M-for-single/test.sh index 1490df2..caeb7d5 100755 --- a/tests/mkfs-tests/013-reserved-1M-for-single/test.sh +++ b/tests/mkfs-tests/013-reserved-1M-for-single/test.sh @@ -6,7 +6,7 @@ # using btrfs_alloc_chunk() which won't use the 0~1M range, so other profiles # are safe, but we test them nevertheless. -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq mkfs.btrfs check_prereq btrfs