From patchwork Sun Mar 1 03:33:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11414125 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5515159A for ; Sun, 1 Mar 2020 03:31:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7A10120675 for ; Sun, 1 Mar 2020 03:31:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="GQz2Du2b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727329AbgCADbA (ORCPT ); Sat, 29 Feb 2020 22:31:00 -0500 Received: from gateway34.websitewelcome.com ([192.185.147.201]:34428 "EHLO gateway34.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbgCADbA (ORCPT ); Sat, 29 Feb 2020 22:31:00 -0500 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway34.websitewelcome.com (Postfix) with ESMTP id D8CFC19782B for ; Sat, 29 Feb 2020 21:30:57 -0600 (CST) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id 8FJhj3HhcAGTX8FJhjBx1T; Sat, 29 Feb 2020 21:30:57 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7yjwzpwQ7WlL/tY/iZN1OoFqu0M1nW0pOX6drwC/UM0=; b=GQz2Du2bIh0BXQ/mhpk4R1qk53 Yp5bl0ETHGySAQeKr5ZjVvg3MEDVItxH4OInwV1KY4yEPCGHeJb5ID/ys0umFP35NzuY6bHCHIcyc gTWN+WKRC6eGmmllML4trCekXTAqgu9i36fYdVccOk/4W3HPGKnLJmINAVOPjfAIWHVbq3WcO4xMS 8+bwFRQ5DlVpwniFEU+wakm08iB4jQqblmyEPjsvATBylPL8M01+zD7GJAo3n/elIKnKohfHFYBEF 5XX9c3mWDJvPOWxtcHE+Dp+NrsqiMjYfw8p8DnwRxIb149ariN2/lq2SuQXWPtK9NN9tpwso6SgMY xYVURSAA==; Received: from 179.187.200.220.dynamic.adsl.gvt.net.br ([179.187.200.220]:36120 helo=hephaestus.suse.cz) by br540.hostgator.com.br with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1j8FJh-0003yt-6N; Sun, 01 Mar 2020 00:30:57 -0300 From: Marcos Paulo de Souza Cc: Marcos Paulo de Souza , dsterba@suse.com, linux-btrfs@vger.kernel.org Subject: [PATCH 1/3] progs: Remove manpages of not packaged binaries Date: Sun, 1 Mar 2020 00:33:42 -0300 Message-Id: <20200301033344.808-2-marcos@mpdesouza.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200301033344.808-1-marcos@mpdesouza.com> References: <20200301033344.808-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 179.187.200.220 X-Source-L: No X-Exim-ID: 1j8FJh-0003yt-6N X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 179.187.200.220.dynamic.adsl.gvt.net.br (hephaestus.suse.cz) [179.187.200.220]:36120 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 4 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes To: unlisted-recipients:; (no To-header on input) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza btrfs-find-root and btrfs-select-super stopped to be shipped in 2014, so remove all references to these manpages as well. Signed-off-by: Marcos Paulo de Souza --- .gitignore | 2 - Documentation/Makefile.in | 2 - Documentation/btrfs-find-root.asciidoc | 35 ----------------- Documentation/btrfs-select-super.asciidoc | 46 ----------------------- Documentation/btrfs.asciidoc | 2 - 5 files changed, 87 deletions(-) delete mode 100644 Documentation/btrfs-find-root.asciidoc delete mode 100644 Documentation/btrfs-select-super.asciidoc diff --git a/.gitignore b/.gitignore index aadf9ae7..2b1c1aef 100644 --- a/.gitignore +++ b/.gitignore @@ -73,7 +73,6 @@ /Documentation/btrfs-convert.8 /Documentation/btrfs-device.8 /Documentation/btrfs-filesystem.8 -/Documentation/btrfs-find-root.8 /Documentation/btrfs-image.8 /Documentation/btrfs-inspect-internal.8 /Documentation/btrfs-ioctl.3 @@ -87,7 +86,6 @@ /Documentation/btrfs-rescue.8 /Documentation/btrfs-restore.8 /Documentation/btrfs-scrub.8 -/Documentation/btrfs-select-super.8 /Documentation/btrfs-send.8 /Documentation/btrfs-subvolume.8 /Documentation/btrfs.8 diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index d35cb858..ff0459c0 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -4,10 +4,8 @@ MAN8_TXT = # Top level commands MAN8_TXT += btrfs.asciidoc MAN8_TXT += btrfs-convert.asciidoc -MAN8_TXT += btrfs-find-root.asciidoc MAN8_TXT += btrfs-image.asciidoc MAN8_TXT += btrfs-map-logical.asciidoc -MAN8_TXT += btrfs-select-super.asciidoc MAN8_TXT += btrfstune.asciidoc MAN8_TXT += fsck.btrfs.asciidoc MAN8_TXT += mkfs.btrfs.asciidoc diff --git a/Documentation/btrfs-find-root.asciidoc b/Documentation/btrfs-find-root.asciidoc deleted file mode 100644 index 652796c8..00000000 --- a/Documentation/btrfs-find-root.asciidoc +++ /dev/null @@ -1,35 +0,0 @@ -btrfs-find-root(8) -================== - -NAME ----- -btrfs-find-root - filter to find btrfs root - -SYNOPSIS --------- -*btrfs-find-root* [options] - -DESCRIPTION ------------ -*btrfs-find-root* is used to find the satisfied root, you can filter by -root tree's objectid, generation, level. - -OPTIONS -------- --a:: -Search through all metadata extents, even the root has been already found. --g :: -Filter root tree by it's original transaction id, tree root's generation in default. --o :: -Filter root tree by it's objectid,tree root's objectid in default. --l :: -Filter root tree by B-+ tree's level, level 0 in default. - -EXIT STATUS ------------ -*btrfs-find-root* will return 0 if no error happened. -If any problems happened, 1 will be returned. - -SEE ALSO --------- -`mkfs.btrfs`(8) diff --git a/Documentation/btrfs-select-super.asciidoc b/Documentation/btrfs-select-super.asciidoc deleted file mode 100644 index e3bca98b..00000000 --- a/Documentation/btrfs-select-super.asciidoc +++ /dev/null @@ -1,46 +0,0 @@ -btrfs-select-super(8) -===================== - -NAME ----- -btrfs-select-super - overwrite primary superblock with a backup copy - -SYNOPSIS --------- -*btrfs-select-super* -s number - -DESCRIPTION ------------ -Destructively overwrite all copies of the superblock -with a specified copy. This helps in certain cases, for example when write -barriers were disabled during a power failure and not all superblocks were -written, or if the primary superblock is damaged, eg. accidentally overwritten. - -The filesystem specified by 'device' must not be mounted. - -NOTE: *Prior to overwriting the primary superblock, please make sure that the backup -copies are valid!* - -To dump a superblock use the *btrfs inspect-internal dump-super* command. - -Then run the check (in the non-repair mode) using the command *btrfs check -s* -where '-s' specifies the superblock copy to use. - -Superblock copies exist in the following offsets on the device: - -- primary: '64KiB' (65536) -- 1st copy: '64MiB' (67108864) -- 2nd copy: '256GiB' (274877906944) - -A superblock size is '4KiB' (4096). - -OPTIONS -------- --s|--super :: -use 'superblock'th superblock copy, valid values are 0 1 or 2 if the -respective superblock offset is within the device size - -SEE ALSO --------- -`btrfs-inspect-internal`(8), -`btrfsck check`(8) diff --git a/Documentation/btrfs.asciidoc b/Documentation/btrfs.asciidoc index 1625f6d8..e3328942 100644 --- a/Documentation/btrfs.asciidoc +++ b/Documentation/btrfs.asciidoc @@ -115,8 +115,6 @@ Tools that are still in active use without an equivalent in *btrfs*: *btrfs-convert*:: in-place conversion from ext2/3/4 filesystems to btrfs *btrfstune*:: tweak some filesystem properties on a unmounted filesystem -*btrfs-select-super*:: rescue tool to overwrite primary superblock from a spare copy -*btrfs-find-root*:: rescue helper to find tree roots in a filesystem Deprecated and obsolete tools: From patchwork Sun Mar 1 03:33:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11414137 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2528917E0 for ; Sun, 1 Mar 2020 04:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04FB721744 for ; Sun, 1 Mar 2020 04:18:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="Isn5nDXy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727316AbgCAES6 (ORCPT ); Sat, 29 Feb 2020 23:18:58 -0500 Received: from gateway20.websitewelcome.com ([192.185.63.14]:16188 "EHLO gateway20.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726490AbgCAES5 (ORCPT ); Sat, 29 Feb 2020 23:18:57 -0500 X-Greylist: delayed 1497 seconds by postgrey-1.27 at vger.kernel.org; Sat, 29 Feb 2020 23:18:57 EST Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 26E3F400D4CFA for ; Sat, 29 Feb 2020 20:16:29 -0600 (CST) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id 8FJjjUIlIEfyq8FJjjZEEJ; Sat, 29 Feb 2020 21:30:59 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=X/bW6P3VVRT9vUyAHqL96x5K0HV6r6CvSjjaoMpJ+LQ=; b=Isn5nDXyl/9u9Lrq8kNiEsJgdb ta1VYCsCEtEVJZZSSnjcB6GWHwbXH7VAFbSpSnTilxVtmOY0X5knzkK7ShPz6N0V/0QF99vP5n2Fj DS9waz67SAOFkJKn+G32pVTciAUuPcnq0ov12ctrA7xQKdv2yE625a/OjEN2CCXFoC/FpJd7WPYOS WtmypmQqiQpHwZsbGcEc8w2OQfQwZeK9cFND6RIFD9YiJCevWc5maHgqH/siPut2oDUIv5EsZYidl kT7OdVpWkdPg9YdP6Q+BbT8gjYGYz2F3w5saiieoqCCLB/xSK+qhqNsTsDsSe6Qsz5uwcYLQksLpz wDsNzX1A==; Received: from 179.187.200.220.dynamic.adsl.gvt.net.br ([179.187.200.220]:36120 helo=hephaestus.suse.cz) by br540.hostgator.com.br with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1j8FJi-0003yt-VU; Sun, 01 Mar 2020 00:30:59 -0300 From: Marcos Paulo de Souza Cc: Marcos Paulo de Souza , dsterba@suse.com, linux-btrfs@vger.kernel.org Subject: [PATCH 2/3] progs: Include btrfs-find-root and btrfs-select-super in testsuite Date: Sun, 1 Mar 2020 00:33:43 -0300 Message-Id: <20200301033344.808-3-marcos@mpdesouza.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200301033344.808-1-marcos@mpdesouza.com> References: <20200301033344.808-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 179.187.200.220 X-Source-L: No X-Exim-ID: 1j8FJi-0003yt-VU X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 179.187.200.220.dynamic.adsl.gvt.net.br (hephaestus.suse.cz) [179.187.200.220]:36120 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 7 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes To: unlisted-recipients:; (no To-header on input) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza Since these two binaries are not shipped into userspace, and they are used by the testsuite, they need to be include in the final tar. Signed-off-by: Marcos Paulo de Souza Reviewed-by: Qu Wenruo --- Makefile | 2 +- tests/testsuite-files | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b00eafe4..0cd7f0c1 100644 --- a/Makefile +++ b/Makefile @@ -424,7 +424,7 @@ test-inst: all test: test-fsck test-mkfs test-misc test-cli test-convert test-fuzz -testsuite: btrfs-corrupt-block fssum +testsuite: btrfs-corrupt-block btrfs-find-root btrfs-select-super fssum @echo "Export tests as a package" $(Q)cd tests && ./export-testsuite.sh diff --git a/tests/testsuite-files b/tests/testsuite-files index 09df6298..507d35fb 100644 --- a/tests/testsuite-files +++ b/tests/testsuite-files @@ -3,6 +3,8 @@ G Documentation/ F testsuite-id F ../fssum F ../btrfs-corrupt-block +F ../btrfs-find-root +F ../btrfs-select-super F common F common.convert F common.local From patchwork Sun Mar 1 03:33:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcos Paulo de Souza X-Patchwork-Id: 11414127 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAC3C14B4 for ; Sun, 1 Mar 2020 03:31:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9855320675 for ; Sun, 1 Mar 2020 03:31:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=mpdesouza.com header.i=@mpdesouza.com header.b="scGBz+OS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbgCADbF (ORCPT ); Sat, 29 Feb 2020 22:31:05 -0500 Received: from gateway21.websitewelcome.com ([192.185.45.38]:17699 "EHLO gateway21.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727242AbgCADbF (ORCPT ); Sat, 29 Feb 2020 22:31:05 -0500 Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway21.websitewelcome.com (Postfix) with ESMTP id 9A41140190A3F for ; Sat, 29 Feb 2020 21:31:03 -0600 (CST) Received: from br540.hostgator.com.br ([108.179.252.180]) by cmsmtp with SMTP id 8FJnjyJaAvBMd8FJnjtSMW; Sat, 29 Feb 2020 21:31:03 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mpdesouza.com; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WZVDCopJ5K/YjtaXUIYj2umLkfZdFI6OZACX9SWXTDg=; b=scGBz+OSJxZ7mUN62U4IVGmNYb HmJxeMNiV4Fkk1fL8LVlccjIVwuKsgaRYF6BF13Buex+OuH1CL0HdoTEKRVU3hM0uYVcgUaqoz2WH KjqnxFKiq83964erlXlONiZJyq4ItNLBOKcgDDsZt2bqAADEVDqF6RHaEnK/pGrPaF4oirFrNGh5D GhLOiCRWXbtaF5NBI90OKyeZFuCbu5H0p9O5aw+j/pABGSfwzuCttrUwNkXY2ZIkDaaoZXvkhOAJN xUM28HxFkX/5yBvf+yZ5VnqD2cY2br+DL/u+hRVXp3idlRC1svrjqMhA2Kf2ZFOFqieVzvPTBX9/y CQlH8BcA==; Received: from 179.187.200.220.dynamic.adsl.gvt.net.br ([179.187.200.220]:36120 helo=hephaestus.suse.cz) by br540.hostgator.com.br with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92) (envelope-from ) id 1j8FJk-0003yt-Kp; Sun, 01 Mar 2020 00:31:01 -0300 From: Marcos Paulo de Souza Cc: Marcos Paulo de Souza , dsterba@suse.com, linux-btrfs@vger.kernel.org Subject: [PATCH 3/3] progs: tests: misc: btrfs-{find-root,select-super} are internal commands Date: Sun, 1 Mar 2020 00:33:44 -0300 Message-Id: <20200301033344.808-4-marcos@mpdesouza.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200301033344.808-1-marcos@mpdesouza.com> References: <20200301033344.808-1-marcos@mpdesouza.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - br540.hostgator.com.br X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - mpdesouza.com X-BWhitelist: no X-Source-IP: 179.187.200.220 X-Source-L: No X-Exim-ID: 1j8FJk-0003yt-Kp X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 179.187.200.220.dynamic.adsl.gvt.net.br (hephaestus.suse.cz) [179.187.200.220]:36120 X-Source-Auth: marcos@mpdesouza.com X-Email-Count: 10 X-Source-Cap: bXBkZXNvNTM7bXBkZXNvNTM7YnI1NDAuaG9zdGdhdG9yLmNvbS5icg== X-Local-Domain: yes To: unlisted-recipients:; (no To-header on input) Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Marcos Paulo de Souza With this commit, testsuite works as expected. Signed-off-by: Marcos Paulo de Souza Reviewed-by: Qu Wenruo --- tests/common | 13 +++++++++---- tests/misc-tests/012-find-root-no-result/test.sh | 2 +- .../020-fix-superblock-corruption/test.sh | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/common b/tests/common index 605cf72c..26190d85 100644 --- a/tests/common +++ b/tests/common @@ -305,13 +305,18 @@ run_mustfail_stdout() check_prereq() { - if [ "$1" = "btrfs-corrupt-block" -o "$1" = "fssum" ]; then + case "$1" in + btrfs-corrupt-block|btrfs-find-root|btrfs-select-super|fssum) if ! [ -f "$INTERNAL_BIN/$1" ]; then _fail "Failed prerequisites: $INTERNAL_BIN/$1"; fi - elif ! [ -f "$TOP/$1" ]; then - _fail "Failed prerequisites: $TOP/$1"; - fi + ;; + *) + if ! [ -f "$TOP/$1" ]; then + _fail "Failed prerequisites: $TOP/$1"; + fi + ;; + esac } check_global_prereq() diff --git a/tests/misc-tests/012-find-root-no-result/test.sh b/tests/misc-tests/012-find-root-no-result/test.sh index 6dd447f3..edfdfd38 100755 --- a/tests/misc-tests/012-find-root-no-result/test.sh +++ b/tests/misc-tests/012-find-root-no-result/test.sh @@ -11,7 +11,7 @@ check_prereq btrfs-image run_check "$TOP/btrfs-image" -r first_meta_chunk.btrfs-image test.img || \ _fail "failed to extract first_meta_chunk.btrfs-image" -result=$(run_check_stdout "$TOP/btrfs-find-root" test.img | sed '/^Superblock/d') +result=$(run_check_stdout "$INTERNAL_BIN/btrfs-find-root" test.img | sed '/^Superblock/d') if [ -z "$result" ]; then _fail "btrfs-find-root failed to find tree root" diff --git a/tests/misc-tests/020-fix-superblock-corruption/test.sh b/tests/misc-tests/020-fix-superblock-corruption/test.sh index 404d416b..d67a87c3 100755 --- a/tests/misc-tests/020-fix-superblock-corruption/test.sh +++ b/tests/misc-tests/020-fix-superblock-corruption/test.sh @@ -25,7 +25,7 @@ test_superblock_restore() _fail "btrfs check should detect corruption" # Copy backup superblock to primary - run_check "$TOP/btrfs-select-super" -s 1 "$TEST_DEV" + run_check "$INTERNAL_BIN/btrfs-select-super" -s 1 "$TEST_DEV" # Perform btrfs check run_check "$TOP/btrfs" check "$TEST_DEV"