From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF9AB3219F for ; Fri, 14 Jun 2024 15:55:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718380557; cv=none; b=ud3I0fAvv0Qu25uI+X/Tq0sPTpVIXAdIvABA15IDFQFLPekQtlvr6jcRz3ECGY7geHeWn4QxuGCLKW9/rOt85WbvLot2x57M4PKhUO/61JviHCbk16rhg9FTRCcQnnjninpOrYjQs0trrgcoFZjiQcnv5sT3jmS4k6kq0vg65ck= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718380557; c=relaxed/simple; bh=Cln/CxZKa6cTQG+AqV02w6cMjf7JLD7d3OwvH9hwQtk=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=uIi+Rpyaq4XdVoPDHht2FMhZNsOOXeuaH7g4x+a03b9YsZ+nd2atSBUk1/psju8wWJCPmyiB0sEGuXhM9AR6cbriQlyhdJW75ExdZ4ffoHrPgBGw2HgtsoWaG1pbIhsHut6ech/JWr0uaaLVQ9A2nHz5eQtot721SNORAO9OkNg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZR8MjJZE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZR8MjJZE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 712C8C2BD10; Fri, 14 Jun 2024 15:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718380556; bh=Cln/CxZKa6cTQG+AqV02w6cMjf7JLD7d3OwvH9hwQtk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZR8MjJZEomXchbDj5PJ1BL2j6h4viuov5+oy4dv3xBueIVjbCfYMxwu9dzlROfV4B 98vFx3N6wByIxkQZ8ZULWNDLdAHUdxvfdPqXmqIZVhGwotmE3lpDDshxnLh3flIReB tSJ/3BnqcgPTj9Z0qK98SviweOk1z9Nby+F8xWnTyZwhZ/iv+3/CpcC5KBcvfDfIgu I+4nxsnJU0pDm0o7f0pq8C2B9kMeQmoz50yMzHdhM7ZznwyFS/VMUEGgQyTnQVa3OR OXMsTto8fmRfB+IG5AEwmZxhHWQp1r5knod1ipz0ygBEe2puK30bztMi0596xNFAta Qz9KsJa5aaMgw== Date: Fri, 14 Jun 2024 08:55:55 -0700 From: "Darrick J. Wong" To: Daniel Gomez Cc: "fstests@vger.kernel.org" , Pankaj Raghav , "mcgrof@kernel.org" , "hughd@google.com" Subject: Re: [PATCH 5/5] common/rc: print scratch and test mount options Message-ID: <20240614155555.GE6110@frogsfrogsfrogs> References: <20240614061722.1080-1-da.gomez@samsung.com> <20240614061722.1080-6-da.gomez@samsung.com> Precedence: bulk X-Mailing-List: fstests@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240614061722.1080-6-da.gomez@samsung.com> On Fri, Jun 14, 2024 at 06:17:26AM +0000, Daniel Gomez wrote: > Mount options for a SCRATCH device might not be the same in the TEST > device if RECREATE_TEST_DEV is not enabled. So, print mount options for > each device to clarify this. > > Add mount and mkfs info for TEST devices so we get the same information > being printed for both devices. > > Signed-off-by: Daniel Gomez > --- > check | 4 ++++ > common/rc | 20 ++++++++++++++++++-- > 2 files changed, 22 insertions(+), 2 deletions(-) > > diff --git a/check b/check > index 723a52e30..e02d28b39 100755 > --- a/check > +++ b/check > @@ -807,7 +807,11 @@ function run_section() > # print out our test configuration > echo "FSTYP -- `_full_fstyp_details`" > echo "PLATFORM -- `_full_platform_details`" > + echo "TEST device:" > + echo "MKFS_OPTIONS -- `_test_mkfs_options`" > + echo "MOUNT_OPTIONS -- `_test_mount_options`" > if [ ! -z "$SCRATCH_DEV" ]; then > + echo "SCRATCH device:" > echo "MKFS_OPTIONS -- `_scratch_mkfs_options`" > echo "MOUNT_OPTIONS -- `_scratch_mount_options`" Now there are two lines that start with "MKFS_OPTIONS"; will this break anyone's parsing scripts? Or should these be prefixed: echo "TEST_MKFS_OPTIONS -- `_test_mkfs_options`" ... echo "SCRATCH_MKFS_OPTIONS -- `_scratch_mkfs_options`" ? Also should these four variables be captured explicitly by the reports that are generated by common/report ? --D > fi > diff --git a/common/rc b/common/rc > index a42792c37..b351a82eb 100644 > --- a/common/rc > +++ b/common/rc > @@ -235,6 +235,17 @@ _scratch_mount_options() > $SCRATCH_DEV $SCRATCH_MNT > } > > +_test_mount_options() > +{ > + _test_options mount > + > + if $RECREATE_TEST_DEV || [ "$OLD_FSTYP" != "$FSTYP" ]; then > + echo $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $TMPFS_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR > + else > + echo $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR > + fi > +} > + > _supports_filetype() > { > local dir=$1 > @@ -456,8 +467,7 @@ _test_mount() > return $? > fi > > - _test_options mount > - _mount -t $FSTYP$FUSE_SUBTYP $TEST_OPTIONS $TEST_FS_MOUNT_OPTS $SELINUX_MOUNT_OPTIONS $TMPFS_MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR > + _mount -t $FSTYP$FUSE_SUBTYP `_test_mount_options $*` > mount_ret=$? > [ $mount_ret -ne 0 ] && return $mount_ret > _idmapped_mount $TEST_DEV $TEST_DIR > @@ -571,6 +581,12 @@ _metadump_dev() { > esac > } > > +_test_mkfs_options() > +{ > + _test_options mkfs > + echo $TEST_OPTIONS $MKFS_OPTIONS $* $TEST_DEV > +} > + > _test_mkfs() > { > case $FSTYP in > -- > 2.43.0 >