From patchwork Wed Apr 8 14:50:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: WorMzy Tykashi X-Patchwork-Id: 6180711 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DA2EFBF4A6 for ; Wed, 8 Apr 2015 14:50:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E64BB200ED for ; Wed, 8 Apr 2015 14:50:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94C08200D4 for ; Wed, 8 Apr 2015 14:50:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932289AbbDHOuI (ORCPT ); Wed, 8 Apr 2015 10:50:08 -0400 Received: from mail-ig0-f172.google.com ([209.85.213.172]:34925 "EHLO mail-ig0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754498AbbDHOuF (ORCPT ); Wed, 8 Apr 2015 10:50:05 -0400 Received: by iggg4 with SMTP id g4so41428041igg.0 for ; Wed, 08 Apr 2015 07:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=NC6CQoeVERXfW62xMitTCxGaJ9/NnOIjiiC3L/Wrxoo=; b=tWJ23EPXQm393I0HrcyexvWVz5DUJPME0xSX74c34lbFUrplguQwphfU+H4LaYdRWT XSEBd5FHbvCqmanZg3iiNkNp9Ce3aNW9jxdvzN/ygTf+UKoNkVXYkBRvXaB3lWCzMbpn JESchtrx6h0CqgJtjOwGISsq8mRJ1IbqfHtg8/Zv4rJ/beYqJ2V+gVstXZRO5UPTVaE5 Iq4+lJBj1F/19F+wgf1nvl/chDwlHzNc3iXZlPlCis6ODF1d2NHKDq2PzI1slPyjBhjq BqSBAG2fX3C+gDafbuZbB8GeFXAugE1exaTS/yeK5ZF5AWWQDS0556zNF9lngodOn1qU 8WUQ== MIME-Version: 1.0 X-Received: by 10.107.135.144 with SMTP id r16mr39982984ioi.13.1428504604393; Wed, 08 Apr 2015 07:50:04 -0700 (PDT) Received: by 10.36.44.18 with HTTP; Wed, 8 Apr 2015 07:50:04 -0700 (PDT) Date: Wed, 8 Apr 2015 15:50:04 +0100 Message-ID: Subject: [PATCH] btrfs-progs: use local btrfs-image in leaf corruption test From: WorMzy Tykashi To: "linux-btrfs@vger.kernel.org" Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Reviewed-by: Qu Wenruo --- -- 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 --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