From patchwork Thu Apr 25 17:31:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 10917553 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A9991390 for ; Thu, 25 Apr 2019 17:37:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71508285C9 for ; Thu, 25 Apr 2019 17:37:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 645D128CC6; Thu, 25 Apr 2019 17:37:52 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 0C3FE285C9 for ; Thu, 25 Apr 2019 17:37:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728011AbfDYRhv (ORCPT ); Thu, 25 Apr 2019 13:37:51 -0400 Received: from mx2.suse.de ([195.135.220.15]:51332 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726916AbfDYRhv (ORCPT ); Thu, 25 Apr 2019 13:37:51 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 4F3BAACD5 for ; Thu, 25 Apr 2019 17:37:50 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id DB136DA847; Thu, 25 Apr 2019 19:38:53 +0200 (CEST) From: David Sterba To: fstests@vger.kernel.org Cc: David Sterba Subject: [PATCH] generic/487: reorder logdev detection after filesystem detection Date: Thu, 25 Apr 2019 19:31:30 +0200 Message-Id: <20190425173130.21706-1-dsterba@suse.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If SCRATCH_LOGDEV variable is unset, the _require_logdev check fails earlier than the following check that decides that this test should not be run on 'btrfs'. Signed-off-by: David Sterba --- tests/generic/487 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/generic/487 b/tests/generic/487 index 8952284cf66f..75db3bfb1333 100755 --- a/tests/generic/487 +++ b/tests/generic/487 @@ -36,7 +36,6 @@ _require_scratch_nocheck # This test uses "dm" without taking into account the data could be on # realtime subvolume, thus the test will fail with rtinherit=1 _require_no_rtinherit -_require_logdev sflag='-s' case $FSTYP in @@ -47,6 +46,7 @@ case $FSTYP in ;; esac +_require_logdev _require_dm_target error rm -f $seqres.full