From patchwork Mon Nov 17 14:53:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omer Zilberberg X-Patchwork-Id: 5322121 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E08F49F1E1 for ; Mon, 17 Nov 2014 14:54:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 817AF2015A for ; Mon, 17 Nov 2014 14:54:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7A3B20173 for ; Mon, 17 Nov 2014 14:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752928AbaKQOx6 (ORCPT ); Mon, 17 Nov 2014 09:53:58 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:51647 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753374AbaKQOx5 (ORCPT ); Mon, 17 Nov 2014 09:53:57 -0500 Received: by mail-wi0-f173.google.com with SMTP id r20so2805870wiv.6 for ; Mon, 17 Nov 2014 06:53:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=yBatomnmryaqIXID4hOV/3s+lwprG5q4XEqaa4u/HmQ=; b=gCDGfixVhXhIckl8yrX4adysYC/SCKFALcA0bdRSd8Qpf9j5V/riu58kDafaHmQDmP yhw/WfXY4OE0gAW7MxN0MitXSW/kc8pMavQEr6lTOc2sW2FGWxtkLMoLMVDScJrEmYWf 5jELat/IUeTvK0GQsp8CPDP8I9PWJbWXzNUE77wrbmfQQ7CGq+icyRhdm90f/Pdy9kRk 0/UGxJVCQWuGsinY6qEunqS57B9zspxPJJPy7/EX3VOLFnir+SGFFQ5L2YyC2ZaYzEKq xUzM688pK49txlWhp+gYw4ss1poQvY+edRgsEFgqEV3YJwjOVxnnBkEQqqiFdXKzOnYn DW7g== X-Gm-Message-State: ALoCoQm5PJ3pFhNh9V/uF/FHkL/XvXE+JDBA192EU1mKyh64lP4dfo8DMLz8eKc6kOKB/LzhSTcV X-Received: by 10.180.103.33 with SMTP id ft1mr31349427wib.71.1416236034309; Mon, 17 Nov 2014 06:53:54 -0800 (PST) Received: from [10.0.0.12] ([207.232.55.62]) by mx.google.com with ESMTPSA id jw2sm15576144wid.3.2014.11.17.06.53.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Nov 2014 06:53:53 -0800 (PST) Message-ID: <546A0BFE.6080608@plexistor.com> Date: Mon, 17 Nov 2014 16:53:50 +0200 From: Omer Zilberberg User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Dave Chinner , Eryu Guan CC: Steve French , fstests@vger.kernel.org, "linux-nfs@vger.kernel.org" , "linux-cifs@vger.kernel.org" , Weston Andros Adamson Subject: Re: [PATCH v2 1/5] common: re-enable tests that require scratch dev on NFS References: <1414775040-4051-1-git-send-email-eguan@redhat.com> <1414775040-4051-2-git-send-email-eguan@redhat.com> <20141113033317.GC28565@dastard> <20141115053533.GK2863@dhcp-13-216.nay.redhat.com> <20141117054141.GK23575@dastard> <20141117060603.GO2863@dhcp-13-216.nay.redhat.com> <20141117065443.GL23575@dastard> In-Reply-To: <20141117065443.GL23575@dastard> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 > Another FYI: we can actually test any filesystem without a scratch > device configured: > > $ sudo TEST_DEV=/dev/vda TEST_DIR=/mnt/test ./check generic/120 > FSTYP -- xfs (non-debug) > PLATFORM -- Linux/x86_64 test2 3.18.0-rc2-dgc+ > > generic/120 16s ... [not run] this test requires a valid $SCRATCH_DEV > Not run: generic/120 > Passed all 0 tests > $ Please note that since commit 83ef157d, that is no longer true, because _require_test calls _is_block_dev with empty parameter, which prints usage: $ sudo TEST_DEV=/dev/sda TEST_DIR=/mnt/dev0 ./check generic/001 FSTYP -- ext4 PLATFORM -- Linux/x86_64 testvm 3.17.0 generic/001 7s ... - output mismatch (see /opt/xfstests/results//generic/001.out.bad) --- tests/generic/001.out 2014-09-10 11:04:44.249185592 +0300 +++ /opt/xfstests/results//generic/001.out.bad 2014-11-17 15:14:12.380061760 +0200 @@ -1,4 +1,5 @@ QA output created by 001 +Usage: _is_block_dev dev cleanup setup .................................... iter 1 chain ... check .................................... ... (Run 'diff -u tests/generic/001.out /opt/xfstests/results//generic/001.out.bad' to see the entire diff) Ran: generic/001 Failures: generic/001 Failed 1 of 1 tests Here's a patch to fix that: ---- Subject: [PATCH] _required_test: removed unneeded test for scratch_dev testing for scratch_dev in _required_test is unnecessary, since it is not required for these tests. Furthermore, if a scratch_dev is not given, all tests which are supposed to pass on test_dev fail, because _is_block_dev is given an empty string as scratch_dev, and prints usage. Signed-off-by: Omer Zilberberg --- common/rc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/rc b/common/rc index d5e3aff..b863808 100644 --- a/common/rc +++ b/common/rc @@ -1104,7 +1104,7 @@ _require_scratch() } -# this test needs a test partition - check we're ok & unmount it +# this test needs a test partition - check we're ok & mount if necessary # _require_test() { @@ -1138,10 +1138,6 @@ _require_test() then _notrun "this test requires a valid \$TEST_DEV" fi - if [ "`_is_block_dev $SCRATCH_DEV`" = "`_is_block_dev $TEST_DEV`" ] - then - _notrun "this test requires a valid \$TEST_DEV" - fi if [ ! -d "$TEST_DIR" ] then _notrun "this test requires a valid \$TEST_DIR"