From patchwork Thu Oct 12 07:28:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10001159 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B3C26028A for ; Thu, 12 Oct 2017 07:29:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E44F28CF8 for ; Thu, 12 Oct 2017 07:29:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2171028CFA; Thu, 12 Oct 2017 07:29:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DD3628CF8 for ; Thu, 12 Oct 2017 07:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751996AbdJLH3I (ORCPT ); Thu, 12 Oct 2017 03:29:08 -0400 Received: from mout.gmx.net ([212.227.15.19]:57690 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751632AbdJLH3G (ORCPT ); Thu, 12 Oct 2017 03:29:06 -0400 Received: from localhost.localdomain ([104.156.253.204]) by mail.gmx.com (mrgmx001 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LeN3N-1dUK3J0zuv-00qEyu; Thu, 12 Oct 2017 09:29:04 +0200 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH 2/2] btrfs-progs: test/mkfs: Test if the minimal device size is valid Date: Thu, 12 Oct 2017 00:28:58 -0700 Message-Id: <20171012072858.19005-2-quwenruo.btrfs@gmx.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171012072858.19005-1-quwenruo.btrfs@gmx.com> References: <20171012072858.19005-1-quwenruo.btrfs@gmx.com> X-Provags-ID: V03:K0:wsF35FZam4YpykFbobNhKWQoAfWK7RmyFBy9JVKLHSYKwDowz5+ uNacs8kMzAfOtzKs/EAoJf2JAZGLRITkTYspKbM/Ib002o5U9EMx2gHG+8N8lCS86pf4iz3 KSpS73xWnMFIjG2k/iLg3Log7h2tXdYeIvNa8HXK/Hn0OkPmuc1iarJ0SIDvkyK5jLpsvci 7YSX/zygiw7nKVzP6faMQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:m5O7gVud3h4=:lP6u2x0gGHm8iD1jQjM+76 ILU7W3tvdrjLmUZ0EWD3qVuYGKtvkzri1XXtSS9acZpVS7LzsAyIJtcDIgaIdHDYayS3d+3L0 oGlU8SzTIYuxtNSXeYo6COCZ3RiE8dy69fdOwRWYO1pEzKa8x/TrfJKfOB3hvLChXylSqvgl+ vQdh/ElUO7Jiwps1owO0BJYzAisyFK9MQLeENkEnhLXTIKl9IThM/JpdOcayqp4Mr/+O8x9Pq wN4cmjDKeAIO0WYKvj/nmJQaXQJeKCxVYmYQt2oqks79/BAM8/CswQT1xmUOHM3Ob/sruSFeo DQVlkEuv2n1lrFymDmwswtfdhr+zgY65a/zTvbGVkPtYGCELdCjTBJNL8Ik+4saIP5Su06Uy0 FdN7j5KjkpvjXocJ2PB/vfNqacI7zkktWGTA8AZ3JNXQkOS7qQ/2IvNFEBlkIjEJME9xlc/Lh YsuPaKJZYk/Is3RTJCMq4kZvLUuzsBFU2sPbWTUAbXAPYb9eD22UF3Y18EpFe9uC/X2PToLTR IhygbNAIihYm2t9Wz5MnkAW7NW3y7shxGi75wxfauIeG8OvKvP4olgyscJu5mTHB6rhEfwc7l cnTViNfulCXzUIk5CsPmx8I7wZMMxrf4Vy0kkibu3iSYt8sDcjiMkSG0GdiJIgekBERlGMRxz lDP6jFNqLkgL9hn1V9/VF6O4NnBe12GQyUH3l0qni5bKlOxs5ogHd2B5qFHpMFIYEz0e/ly7t A1I25ttGgKlIogRy++tqnTBbUyhpZQrqKy98FUVoNdltMNXqt05n5mI6nEK+yxT159J5/rUPa mBTy6vrqN2YqI2eKIPuyi3BwF3Jew== Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP New test case to test if the minimal device size given by "mkfs.btrfs" failure case is valid. Signed-off-by: Qu Wenruo --- tests/common | 57 +++++++++++++++++++++++++++++++- tests/mkfs-tests/010-small-image/test.sh | 51 ++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100755 tests/mkfs-tests/010-small-image/test.sh diff --git a/tests/common b/tests/common index eb525a4d02c5..e026cc2f4d30 100644 --- a/tests/common +++ b/tests/common @@ -236,6 +236,57 @@ run_mustfail() fi } +run_mustfail_stdout() +{ + local spec + local ins + local cmd + local msg + local ret + + # We don't use pipefail to avoid disturbing other script, so here we + # use temporary output file. + # So it doesn't support pipeline in the @cmd + local tmp_output + + tmp_output=$(mktemp --tmpdir btrfs-progs-test--mustfail-stdtout.XXXXXX) + + msg="$1" + shift + + if _is_file_or_command "$msg"; then + echo "ASSERTION FAIL: 1st argument of run_mustfail_stdout must be a message" + exit 1 + fi + + ins=$(_get_spec_ins "$@") + spec=$(($ins-1)) + cmd=$(eval echo "\${$spec}") + spec=$(_cmd_spec "${@:$spec}") + set -- "${@:1:$(($ins-1))}" $spec "${@: $ins}" + echo "############### $@" >> "$RESULTS" 2>&1 + if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mustfail): $@" > /dev/tty; fi + if [ "$1" = 'root_helper' ]; then + "$@" 2>&1 > "$tmp_output" + else + $INSTRUMENT "$@" 2>&1 > "$tmp_output" + fi + ret=$? + + cat "$tmp_output" >> "$RESULTS" + cat "$tmp_output" + rm "$tmp_output" + + if [ "$ret" != 0 ]; then + echo "failed (expected): $@" >> "$RESULTS" + return 0 + else + echo "succeeded (unexpected!): $@" >> "$RESULTS" + _fail "unexpected success: $msg" + return 1 + fi +} + check_prereq() { if ! [ -f "$TOP/$1" ]; then @@ -389,7 +440,11 @@ prepare_test_dev() # num[K/M/G/T...] local size="$1" - [[ "$TEST_DEV" ]] && return + # Still truncate it to new size + if [[ "$TEST_DEV" ]]; then + truncate -s "$size" "$TEST_DEV" + return; + fi [[ "$size" ]] || size='2G' echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \ diff --git a/tests/mkfs-tests/010-small-image/test.sh b/tests/mkfs-tests/010-small-image/test.sh new file mode 100755 index 000000000000..f12c9c836bd6 --- /dev/null +++ b/tests/mkfs-tests/010-small-image/test.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# test if the reported minimal size of mkfs.btrfs is valid + +source $TOP/tests/common + +check_prereq mkfs.btrfs +check_prereq btrfs + +setup_root_helper + +pagesize=$(getconf PAGESIZE) + +do_test() +{ + # Well, 1M small enough to fail, we just use the output + # to get the minimal device size + prepare_test_dev 1M + output=$(run_mustfail_stdout "mkfs.btrfs for small image" \ + $TOP/mkfs.btrfs -f $@ "$TEST_DEV") + good_size=$(echo $output | grep -o "[[:digit:]]\{3,\}") + + prepare_test_dev "$good_size" + run_check $TOP/mkfs.btrfs -f $@ "$TEST_DEV" + run_check $SUDO_HELPER mount $TEST_DEV $TEST_MNT + run_check $SUDO_HELPER umount $TEST_MNT +} + +do_test -n 4k -m single -d single +do_test -n 4k -m single -d dup +do_test -n 4k -m dup -d single +do_test -n 4k -m dup -d dup + +do_test -n 8k -m single -d single +do_test -n 8k -m single -d dup +do_test -n 8k -m dup -d single +do_test -n 8k -m dup -d dup + +do_test -n 16k -m single -d single +do_test -n 16k -m single -d dup +do_test -n 16k -m dup -d single +do_test -n 16k -m dup -d dup + +do_test -n 32k -m single -d single +do_test -n 32k -m single -d dup +do_test -n 32k -m dup -d single +do_test -n 32k -m dup -d dup + +do_test -n 64k -m single -d single +do_test -n 64k -m single -d dup +do_test -n 64k -m dup -d single +do_test -n 64k -m dup -d dup