From patchwork Tue Jan 2 17:17:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 10141085 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 737A7601A1 for ; Tue, 2 Jan 2018 17:17:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58CBA2858D for ; Tue, 2 Jan 2018 17:17:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D3B828CED; Tue, 2 Jan 2018 17:17:18 +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.9 required=2.0 tests=BAYES_00,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 31B8B285C5 for ; Tue, 2 Jan 2018 17:17:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750968AbeABRRQ (ORCPT ); Tue, 2 Jan 2018 12:17:16 -0500 Received: from mx2.suse.de ([195.135.220.15]:37816 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751097AbeABRRQ (ORCPT ); Tue, 2 Jan 2018 12:17:16 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 37128ACC8; Tue, 2 Jan 2018 17:17:15 +0000 (UTC) Received: by hermes (Postfix, from userid 1000) id AF0792820E0; Tue, 2 Jan 2018 17:17:06 +0000 (WET) From: Luis Henriques To: fstests@vger.kernel.org Cc: Chengguang Xu , Luis Henriques Subject: [PATCH] generic/050: fix _require_local_device $SCRATCH_DEV check order Date: Tue, 2 Jan 2018 17:17:05 +0000 Message-Id: <20180102171705.24066-1-lhenriques@suse.com> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 2b4eae7fd825 ("common/rc: add scratch shutdown support for overlayfs") added a _require_local_device check to generic tests 042 and 050. However, for test 050, this check was added _before_ actually verifying that a SCRATCH_DEV actually exists. This patch simply re-orders the _require_local_device to the right place. Signed-off-by: Luis Henriques --- tests/generic/050 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/generic/050 b/tests/generic/050 index dbf0ac5cd185..e6e8bc1b9733 100755 --- a/tests/generic/050 +++ b/tests/generic/050 @@ -44,9 +44,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fs generic _supported_os Linux -_require_local_device $SCRATCH_DEV _require_scratch_nocheck _require_scratch_shutdown +_require_local_device $SCRATCH_DEV _require_norecovery _scratch_mkfs >/dev/null 2>&1