From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F419C433B4 for ; Sat, 15 May 2021 11:23:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4C5B6613CE for ; Sat, 15 May 2021 11:23:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230272AbhEOLYq (ORCPT ); Sat, 15 May 2021 07:24:46 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:2932 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229490AbhEOLYp (ORCPT ); Sat, 15 May 2021 07:24:45 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4Fj2y70tlLzCrmp; Sat, 15 May 2021 19:20:47 +0800 (CST) Received: from huawei.com (10.175.101.6) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Sat, 15 May 2021 19:23:20 +0800 From: Sun Ke To: , CC: Subject: [PATCH] common/rc: make _mkfs_dev return mkfs_status Date: Sat, 15 May 2021 07:28:20 -0400 Message-ID: <20210515112820.447767-1-sunke32@huawei.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.175.101.6] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org If _mkfs_dev fialed，the test should notrun. _mkfs_dev may need to return mkfs_status as _scratch_mkfs_ext4 and _scratch_mkfs_xfs do. Signed-off-by: Sun Ke --- I run generic/test/042 on f2fs, it failed, because the device size is too small： F2FS-tools: mkfs.f2fs Ver: 1.9.0 (2017-09-21) Info: Disable heap-based policy Info: Debug level = 0 Info: Label = Info: Trim is enabled Info: Segments per section = 1 Info: Sections per zone = 1 Info: sector size = 512 Info: total sectors = 51200 (25 MB) Info: zone aligned segment0 blkaddr: 512 Error: Device size is not sufficient for F2FS volume Error: Failed to prepare a super block!!! Error: Could not format the device!!! Change the device size to 40M, it can pass. But I am not sure if it will change the test's intention. [root@localhost xfstests]# ./check tests/generic/042 FSTYP -- f2fs PLATFORM -- Linux/x86_64 localhost 5.12.0-rc5-next-20210330 #2 SMP Thu Apr 15 00:58:54 EDT 2021 MKFS_OPTIONS -- /dev/sdb MOUNT_OPTIONS -- -o acl,user_xattr /dev/sdb /mnt/scratch generic/042 3s ... 4s Ran: generic/042 Passed all 1 tests Other tests also use _mkfs_dev(), if making _mkfs_dev return mkfs_status is ok, I will modify them in V2. [root@localhost xfstests]# ./check tests/generic/042 FSTYP -- f2fs PLATFORM -- Linux/x86_64 localhost 5.12.0-rc5-next-20210330 #3 SMP Wed Apr 21 22:29:25 EDT 2021 MKFS_OPTIONS -- /dev/sdb MOUNT_OPTIONS -- -o acl,user_xattr /dev/sdb /mnt/scratch generic/042 2s ... [not run] mkfs failed! Ran: generic/042 Not run: generic/042 Passed all 1 tests common/rc | 14 ++++++++------ tests/generic/042 | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/common/rc b/common/rc index 0ce3cb0d..4254806a 100644 --- a/common/rc +++ b/common/rc @@ -642,6 +642,8 @@ _test_mkfs() _mkfs_dev() { local tmp=`mktemp -u` + local mkfs_status + case $FSTYP in nfs*) # do nothing for nfs @@ -677,15 +679,15 @@ _mkfs_dev() 2>$tmp.mkfserr 1>$tmp.mkfsstd ;; esac + mkfs_status=$? - if [ $? -ne 0 ]; then - # output stored mkfs output - cat $tmp.mkfserr >&2 - cat $tmp.mkfsstd - status=1 - exit 1 + if [ $mkfs_status -ne 0 ]; then + # output stored mkfs output + cat $tmp.mkfserr >&2 + cat $tmp.mkfsstd fi rm -f $tmp.mkfserr $tmp.mkfsstd + return $mkfs_status } # remove all files in $SCRATCH_MNT, useful when testing on NFS/CIFS diff --git a/tests/generic/042 b/tests/generic/042 index 35727bcb..68bc15ca 100755 --- a/tests/generic/042 +++ b/tests/generic/042 @@ -46,7 +46,7 @@ _crashtest() # the image to detect stale data exposure. $XFS_IO_PROG -f -c "truncate 0" -c "pwrite -S 0xCD 0 25M" $img \ >> $seqres.full 2>&1 - _mkfs_dev $img >> $seqres.full 2>&1 + _mkfs_dev $img >> $seqres.full 2>&1 || _notrun "mkfs failed!" mkdir -p $mnt _mount $img $mnt -- 2.13.6