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 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 91F1EC3DA41 for ; Tue, 9 Jul 2024 11:19:07 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 176513D391D for ; Tue, 9 Jul 2024 13:19:06 +0200 (CEST) Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [217.194.8.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id AA4743D121E for ; Tue, 9 Jul 2024 13:18:51 +0200 (CEST) Authentication-Results: in-7.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=2a07:de40:b251:101:10:150:64:2; helo=smtp-out2.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) (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-7.smtp.seeweb.it (Postfix) with ESMTPS id 0487C2001A7 for ; Tue, 9 Jul 2024 13:18:50 +0200 (CEST) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7AF3A1F7B7; Tue, 9 Jul 2024 11:18:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1720523929; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pIPAD3x6FPeERrnefQd7u+9DuYRXtEzv4+1hXT3Mqjs=; b=D+FD6hIzLeNTNjeukoqtH4aU8SbMS/3FekG2oRRgqNaTEMj2oKYe2C8WeE3u+AmAL+qCXO XNvwNqKh1T42Av3sTmeh6/5NatJg+z+HbxywVKGqeT5C4qib1OMduzRJMmOaeTwqKM27em nkNGJYB5GY44kjM2lA3frPy1oTXS7fc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1720523929; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pIPAD3x6FPeERrnefQd7u+9DuYRXtEzv4+1hXT3Mqjs=; b=oteCkqJfu/AZpaFmzEXpZAopfwALF/R88JhztMvtrcvvLygD08Ji64LgPJtGoP4jIi5Jig /JgBZt/iukJ43fAw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=D+FD6hIz; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=oteCkqJf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1720523929; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pIPAD3x6FPeERrnefQd7u+9DuYRXtEzv4+1hXT3Mqjs=; b=D+FD6hIzLeNTNjeukoqtH4aU8SbMS/3FekG2oRRgqNaTEMj2oKYe2C8WeE3u+AmAL+qCXO XNvwNqKh1T42Av3sTmeh6/5NatJg+z+HbxywVKGqeT5C4qib1OMduzRJMmOaeTwqKM27em nkNGJYB5GY44kjM2lA3frPy1oTXS7fc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1720523929; h=from:from:reply-to:reply-to:date:date:message-id:message-id:to:to: cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pIPAD3x6FPeERrnefQd7u+9DuYRXtEzv4+1hXT3Mqjs=; b=oteCkqJfu/AZpaFmzEXpZAopfwALF/R88JhztMvtrcvvLygD08Ji64LgPJtGoP4jIi5Jig /JgBZt/iukJ43fAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 32E0C1396E; Tue, 9 Jul 2024 11:18:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UxOfCZkcjWYJXwAAD6G6ig (envelope-from ); Tue, 09 Jul 2024 11:18:49 +0000 Date: Tue, 9 Jul 2024 13:18:47 +0200 From: Petr Vorel To: Cyril Hrubis Message-ID: <20240709111847.GA198566@pevik> References: <20240709103324.183993-1-pvorel@suse.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 7AF3A1F7B7 X-Spamd-Result: default: False [-3.71 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; HAS_REPLYTO(0.30)[pvorel@suse.cz]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.992]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:replyto,suse.cz:dkim]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.cz:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DWL_DNSWL_BLOCKED(0.00)[suse.cz:dkim]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[8]; MISSING_XM_UA(0.00)[]; REPLYTO_EQ_FROM(0.00)[] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Virus-Scanned: clamav-milter 1.0.3 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: Re: [LTP] [PATCH 1/1] tst_test: Fix tests using device without .filesystems 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: , Reply-To: Petr Vorel Cc: ltp@lists.linux.it Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Hi Cyril, > Hi! > > diff --git a/lib/tst_test.c b/lib/tst_test.c > > index b49c248ae..6d258cd28 100644 > > --- a/lib/tst_test.c > > +++ b/lib/tst_test.c > > @@ -1355,8 +1355,11 @@ static void do_setup(int argc, char *argv[]) > > tdev.fs_type = default_fs_type(); > > - if (!tst_test->all_filesystems && count_fs_descs() == 1) > > - prepare_device(&tst_test->filesystems[0]); > > + if (!tst_test->all_filesystems && count_fs_descs() <= 1) { > > + prepare_device(tst_test->filesystems ? > > + &tst_test->filesystems[0] : > > + &(struct tst_fs){.type = tdev.fs_type}); > Another option would be to change prepare_device() so that it works fine > with NULL tst_fs pointer, then we could simply do: > prepare_device(tst_test->filesystems); > And for that we would have to do something like this: > diff --git a/lib/tst_test.c b/lib/tst_test.c > index b49c248ae..ec6deea9b 100644 > --- a/lib/tst_test.c > +++ b/lib/tst_test.c > @@ -1101,6 +1101,9 @@ static void prepare_device(struct tst_fs *fs) > { > const char *mnt_data; > char buf[1024]; > + struct tst_fs dummy = {}; > + > + fs = fs ? &dummy : fs; This looks more elegant, but I get coredump. I also think you need to have count_fs_descs() <= 1 and maybe define fs_type (not sure about it). Feel free to post v2. Kind regards, Petr > const char *const extra[] = {fs->mkfs_size_opt, NULL}; > > + } > > } > > if (tst_test->needs_overlay && !tst_test->mount_device) > > -- > > 2.45.2 -- Mailing list info: https://lists.linux.it/listinfo/ltp