Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7BA0CC28CF5 for ; Wed, 26 Jan 2022 18:13:13 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BA2C13C96E7 for ; Wed, 26 Jan 2022 19:13:11 +0100 (CET) Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 14D8D3C96D8 for ; Wed, 26 Jan 2022 19:12:17 +0100 (CET) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id D34E3600152 for ; Wed, 26 Jan 2022 19:12:16 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0CA5D1F3B0; Wed, 26 Jan 2022 18:12:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1643220736; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ksgE3jBvD7Wt21IxWim0AXclhdcC3AkIu7YwQZa3Cog=; b=tE2cIiUO/VUTaH2ECJG6te1JWisdW7GrJHQsPCd01Dz3Npbjy+JP7BQO9xAzNH5b5boyD1 VKhWERPuQvXOY9hqPcMHGj/w3pmtGq370bmG+UKlP6vFV0vF5ZfHfhmP3d6pe3z3IOy1rQ bMh5sqToipaYUW5FgNVZT4SZ6N/Ch2A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1643220736; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ksgE3jBvD7Wt21IxWim0AXclhdcC3AkIu7YwQZa3Cog=; b=S8XEguwFkmRCQ2XpFJPhiXQAddvbCC35aQ18FE/lOfEof7phGMBORAl2hnuAS2OSchg9RS hmO2Tg2UHA6ZwQCQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D263913E30; Wed, 26 Jan 2022 18:12:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yNQ2Mf+O8WGbcQAAMHmgww (envelope-from ); Wed, 26 Jan 2022 18:12:15 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 26 Jan 2022 19:12:06 +0100 Message-Id: <20220126181210.24897-2-pvorel@suse.cz> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220126181210.24897-1-pvorel@suse.cz> References: <20220126181210.24897-1-pvorel@suse.cz> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-2.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 1/5] tst_test.sh: Add $TST_DEFAULT_FS_TYPE X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" To sync with C API which also has defined the default filesystem. That required to whitelist ) added after variable to allow use in help: (currently $TST_DEFAULT_FS_TYPE). Use it in df01.sh, mkfs01.sh (the only tests which works with filesystems). Signed-off-by: Petr Vorel --- testcases/commands/df/df01.sh | 4 +--- testcases/commands/mkfs/mkfs01.sh | 4 ++-- testcases/lib/tst_test.sh | 11 ++++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/testcases/commands/df/df01.sh b/testcases/commands/df/df01.sh index b821452e60..0d09e290ce 100755 --- a/testcases/commands/df/df01.sh +++ b/testcases/commands/df/df01.sh @@ -23,13 +23,11 @@ usage: $0 [-f ] OPTIONS -f Specify the type of filesystem to be built. If not - specified, the default filesystem type (currently ext2) + specified, the default filesystem type (currently $TST_DEFAULT_FS_TYPE) is used. EOF } -TST_FS_TYPE=ext2 - parse_args() { TST_FS_TYPE="$2" diff --git a/testcases/commands/mkfs/mkfs01.sh b/testcases/commands/mkfs/mkfs01.sh index 17c7fb9e4a..e2896858f9 100755 --- a/testcases/commands/mkfs/mkfs01.sh +++ b/testcases/commands/mkfs/mkfs01.sh @@ -23,7 +23,7 @@ usage: $0 [-f ] OPTIONS -f Specify the type of filesystem to be built. If not - specified, the default filesystem type (currently ext2) + specified, the default filesystem type (currently $TST_DEFAULT_FS_TYPE) is used. EOF } @@ -45,7 +45,7 @@ setup() mkfs_verify_type() { if [ -z "$1" ]; then - blkid $2 -t TYPE="ext2" >/dev/null + blkid $2 -t TYPE="$TST_DEFAULT_FS_TYPE" >/dev/null else if [ "$1" = "msdos" ]; then blkid $2 -t TYPE="vfat" >/dev/null diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index 30614974c3..eb3bf0df12 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -17,6 +17,8 @@ export TST_ITERATIONS=1 export TST_TMPDIR_RHOST=0 export TST_LIB_LOADED=1 +export TST_DEFAULT_FS_TYPE="ext2" + . tst_ansi_color.sh . tst_security.sh @@ -338,15 +340,13 @@ tst_umount() tst_mkfs() { local fs_type=${1:-$TST_FS_TYPE} + [ -z "$fs_type" ] && fs_type="$TST_DEFAULT_FS_TYPE" + local device=${2:-$TST_DEVICE} [ $# -ge 1 ] && shift [ $# -ge 1 ] && shift local fs_opts="$@" - if [ -z "$fs_type" ]; then - tst_brk TBROK "No fs_type specified" - fi - if [ -z "$device" ]; then tst_brk TBROK "No device specified" fi @@ -599,7 +599,7 @@ tst_run() local _tst_name if [ -n "$TST_TEST_PATH" ]; then - for _tst_i in $(grep '^[^#]*\bTST_' "$TST_TEST_PATH" | sed 's/.*TST_//; s/[="} \t\/:`].*//'); do + for _tst_i in $(grep '^[^#]*\bTST_' "$TST_TEST_PATH" | sed 's/.*TST_//; s/[="} \t\/:`)].*//'); do case "$_tst_i" in DISABLE_APPARMOR|DISABLE_SELINUX);; SETUP|CLEANUP|TESTFUNC|ID|CNT|MIN_KVER);; @@ -614,6 +614,7 @@ tst_run() NET_SKIP_VARIABLE_INIT|NEEDS_CHECKPOINTS);; CHECKPOINT_WAIT|CHECKPOINT_WAKE);; CHECKPOINT_WAKE2|CHECKPOINT_WAKE_AND_WAIT);; + DEFAULT_FS_TYPE);; *) tst_res TWARN "Reserved variable TST_$_tst_i used!";; esac done -- 2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp