diff mbox

btrfs-progs: use local btrfs-image in leaf corruption test

Message ID CALOYprWfYKJG-9d=J9WLEisWLcpcKwv4bPwfcjggw-EC4phbGA@mail.gmail.com (mailing list archive)
State Accepted
Headers show

Commit Message

WorMzy Tykashi April 8, 2015, 2:50 p.m. UTC 
Currently this test uses the system btrfs-image. If there isn't a
btrfs-image on $PATH, the test fails. The test should be using the
locally compiled btrfs-image, not the system one.
---

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Qu Wenruo April 9, 2015, 1:43 a.m. UTC | #1 
> Currently this test uses the system btrfs-image. If there isn't a
> btrfs-image on $PATH, the test fails. The test should be using the
> locally compiled btrfs-image, not the system one.
Good catch.

Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com>

Thanks,
Qu
> ---
>
> diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh
> b/tests/fsck-tests/012-leaf-corruption/test.sh
> index 4db4710..98e3185 100755
> --- a/tests/fsck-tests/012-leaf-corruption/test.sh
> +++ b/tests/fsck-tests/012-leaf-corruption/test.sh
> @@ -37,7 +37,7 @@ generate_leaf_corrupt_no_data_ext()
>       echo "generating leaf_corrupt_no_data_ext.btrfs-image" >> $RESULTS
>       tar xJf ./no_data_extent.tar.xz || \
>           _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image"
> -    btrfs-image -r test.img.btrfs-image $dest || \
> +    $TOP/btrfs-image -r test.img.btrfs-image $dest || \
>           _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image"
>
>       # leaf at 20832256 contains no regular data extent, clear its csum to
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Sterba April 9, 2015, 4:45 p.m. UTC | #2 
On Wed, Apr 08, 2015 at 03:50:04PM +0100, WorMzy Tykashi wrote:
> Currently this test uses the system btrfs-image. If there isn't a
> btrfs-image on $PATH, the test fails. The test should be using the
> locally compiled btrfs-image, not the system one.

Added your sign-off and applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh
b/tests/fsck-tests/012-leaf-corruption/test.sh
index 4db4710..98e3185 100755
--- a/tests/fsck-tests/012-leaf-corruption/test.sh
+++ b/tests/fsck-tests/012-leaf-corruption/test.sh
@@ -37,7 +37,7 @@  generate_leaf_corrupt_no_data_ext()
     echo "generating leaf_corrupt_no_data_ext.btrfs-image" >> $RESULTS
     tar xJf ./no_data_extent.tar.xz || \
         _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image"
-    btrfs-image -r test.img.btrfs-image $dest || \
+    $TOP/btrfs-image -r test.img.btrfs-image $dest || \
         _fail "failed to extract leaf_corrupt_no_data_ext.btrfs-image"

     # leaf at 20832256 contains no regular data extent, clear its csum to