All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Buchbinder <abuchbinder@google.com>
To: linux-btrfs@vger.kernel.org
Cc: Adam Buchbinder <abuchbinder@google.com>
Subject: [PATCH] btrfs-progs: Use '-t btrfs' mount option in tests.
Date: Wed, 12 Jul 2017 13:05:22 -0700	[thread overview]
Message-ID: <20170712200522.18830-1-abuchbinder@google.com> (raw)

Without it, mount (at least from util-linux 2.20.1) tries (and
fails) to mount some filesystems as NTFS.

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
---
 tests/common                                 | 2 +-
 tests/fsck-tests/012-leaf-corruption/test.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/common b/tests/common
index 7ad436e..bed6009 100644
--- a/tests/common
+++ b/tests/common
@@ -387,7 +387,7 @@ run_check_mount_test_dev()
 		_fail "Invalid \$TEST_MNT: $TEST_MNT"
 	}
 
-	run_check $SUDO_HELPER mount $loop_opt "$@" "$TEST_DEV" "$TEST_MNT"
+	run_check $SUDO_HELPER mount -t btrfs $loop_opt "$@" "$TEST_DEV" "$TEST_MNT"
 }
 
 run_check_umount_test_dev()
diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh
index 43b0e6d..fc10a4f 100755
--- a/tests/fsck-tests/012-leaf-corruption/test.sh
+++ b/tests/fsck-tests/012-leaf-corruption/test.sh
@@ -90,7 +90,7 @@ check_inode()
 check_leaf_corrupt_no_data_ext()
 {
 	image=$1
-	$SUDO_HELPER mount -o loop "$image" -o ro "$TEST_MNT"
+	$SUDO_HELPER mount -o loop -t btrfs "$image" -o ro "$TEST_MNT"
 
 	i=0
 	while [ $i -lt ${#leaf_no_data_ext_list[@]} ]; do
-- 
2.13.2.932.g7449e964c-goog


             reply	other threads:[~2017-07-12 20:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-12 20:05 Adam Buchbinder [this message]
2017-07-12 21:52 ` [PATCH] btrfs-progs: Use '-t btrfs' mount option in tests David Sterba
2017-07-20  9:40   ` Qu Wenruo
2017-07-20 15:42     ` David Sterba
2017-07-21 12:36       ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170712200522.18830-1-abuchbinder@google.com \
    --to=abuchbinder@google.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.