From patchwork Tue Jan 23 16:26:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1889799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=sQv9CCA5; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=99RZpg5i; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=sQv9CCA5; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=99RZpg5i; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TKCD36Vpwz1yS7 for ; Wed, 24 Jan 2024 03:27:15 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id BCEE33CE2A5 for ; Tue, 23 Jan 2024 17:27:13 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (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 7F0AE3CB939 for ; Tue, 23 Jan 2024 17:26:54 +0100 (CET) Authentication-Results: in-3.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=2a07:de40:b251:101:10:150:64:1; helo=smtp-out1.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) (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-3.smtp.seeweb.it (Postfix) with ESMTPS id 81A031A027AC for ; Tue, 23 Jan 2024 17:26:53 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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-out1.suse.de (Postfix) with ESMTPS id CBE00222FF; Tue, 23 Jan 2024 16:26:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027212; 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=gEZ0ocnlrCVpMTAzCOuU9Bk9p7S58WnKpUvBYNQjILM=; b=sQv9CCA5w4GulG9kkVVpHr9FjA87ni7mwR9MLa0/hvFBHlUyRJeJvmmiyIGyKboGrrHh/j Mfo+UgKLrV6B2geOgY7c9RbLNTyMCSs2QWtaZjHAWLDwYrDL/+ywbDy5wCm/8vu+NV0z+i VXVtns3CWW5olclt0uOgmL+Nj6GY2x4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027212; 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=gEZ0ocnlrCVpMTAzCOuU9Bk9p7S58WnKpUvBYNQjILM=; b=99RZpg5i9FXNeqHLIqh8YwvhD+i7Omz4DU0PZKIo6RPCIOV4Qr0KCd60xOUkYLLajjmXtG lhPIorj3VcutLGDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027212; 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=gEZ0ocnlrCVpMTAzCOuU9Bk9p7S58WnKpUvBYNQjILM=; b=sQv9CCA5w4GulG9kkVVpHr9FjA87ni7mwR9MLa0/hvFBHlUyRJeJvmmiyIGyKboGrrHh/j Mfo+UgKLrV6B2geOgY7c9RbLNTyMCSs2QWtaZjHAWLDwYrDL/+ywbDy5wCm/8vu+NV0z+i VXVtns3CWW5olclt0uOgmL+Nj6GY2x4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027212; 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=gEZ0ocnlrCVpMTAzCOuU9Bk9p7S58WnKpUvBYNQjILM=; b=99RZpg5i9FXNeqHLIqh8YwvhD+i7Omz4DU0PZKIo6RPCIOV4Qr0KCd60xOUkYLLajjmXtG lhPIorj3VcutLGDQ== 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 51339139B1; Tue, 23 Jan 2024 16:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id uDO9EMzor2V+CwAAD6G6ig (envelope-from ); Tue, 23 Jan 2024 16:26:52 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Tue, 23 Jan 2024 17:26:44 +0100 Message-ID: <20240123162647.210424-2-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240123162647.210424-1-pvorel@suse.cz> References: <20240123162647.210424-1-pvorel@suse.cz> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 3.56 X-Spamd-Result: default: False [3.56 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[6]; NEURAL_HAM_LONG(-0.99)[-0.992]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.17)[-0.874]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.17)[70.06%] X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-3.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-3.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 1/4] tst_test.sh: Improve info on wrong tst_brk param 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Print wrong $res parameter in tst_brk helps searching wrong code. Signed-off-by: Petr Vorel --- testcases/lib/tst_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index 05a920156..0d2fccb95 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -135,7 +135,7 @@ tst_brk() fi if [ "$res" != TBROK -a "$res" != TCONF ]; then - tst_res TBROK "tst_brk can be called only with TBROK or TCONF" + tst_res TBROK "tst_brk can be called only with TBROK or TCONF ($res)" else tst_res "$res" "$@" fi From patchwork Tue Jan 23 16:26:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1889800 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=G33Twzts; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=teQPo60S; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=G33Twzts; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=teQPo60S; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (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 legolas.ozlabs.org (Postfix) with ESMTPS id 4TKCDM14CQz1yS7 for ; Wed, 24 Jan 2024 03:27:31 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 2962B3CE208 for ; Tue, 23 Jan 2024 17:27:29 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) (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 E84EB3CB939 for ; Tue, 23 Jan 2024 17:26:54 +0100 (CET) Authentication-Results: in-5.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=2a07:de40:b251:101:10:150:64:1; helo=smtp-out1.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) (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-5.smtp.seeweb.it (Postfix) with ESMTPS id 05574608A65 for ; Tue, 23 Jan 2024 17:26:54 +0100 (CET) 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-out1.suse.de (Postfix) with ESMTPS id 7B7ED22308; Tue, 23 Jan 2024 16:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027213; 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=qhpS5dVdrSAN30nXGY8gue30P+GQRMTVPIwBgvdZuA8=; b=G33TwztsDcyohGI/xdznmrSMj0qP8NVEL0ki+456Vz8lOLyOpEk+lvfREWzQQZD0+Keujj AVJx4a4DGRUcMJJhUEeMDr+ojxQ+YrW7dUSnDP60qahz7Ihi7Mi3hPLSzjkg2s55BccfLv iSZOCgqaYrMxxIoe8CMQhrD5yxEwJdU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027213; 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=qhpS5dVdrSAN30nXGY8gue30P+GQRMTVPIwBgvdZuA8=; b=teQPo60Sr6XpYDrKVaecHb/dLLvNZYzj/YBDth7FAQjZxMUXWc2HOV0dapk883WDDrcYJ2 XClKcPp5yR2QXTDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027213; 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=qhpS5dVdrSAN30nXGY8gue30P+GQRMTVPIwBgvdZuA8=; b=G33TwztsDcyohGI/xdznmrSMj0qP8NVEL0ki+456Vz8lOLyOpEk+lvfREWzQQZD0+Keujj AVJx4a4DGRUcMJJhUEeMDr+ojxQ+YrW7dUSnDP60qahz7Ihi7Mi3hPLSzjkg2s55BccfLv iSZOCgqaYrMxxIoe8CMQhrD5yxEwJdU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027213; 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=qhpS5dVdrSAN30nXGY8gue30P+GQRMTVPIwBgvdZuA8=; b=teQPo60Sr6XpYDrKVaecHb/dLLvNZYzj/YBDth7FAQjZxMUXWc2HOV0dapk883WDDrcYJ2 XClKcPp5yR2QXTDA== 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 EC74013786; Tue, 23 Jan 2024 16:26:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id 6JzbNczor2V+CwAAD6G6ig (envelope-from ); Tue, 23 Jan 2024 16:26:52 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Tue, 23 Jan 2024 17:26:45 +0100 Message-ID: <20240123162647.210424-3-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240123162647.210424-1-pvorel@suse.cz> References: <20240123162647.210424-1-pvorel@suse.cz> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=G33Twzts; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=teQPo60S X-Spamd-Result: default: False [9.66 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; SPAM_FLAG(5.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.cz:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.03)[56.70%] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Score: 9.66 X-Rspamd-Queue-Id: 7B7ED22308 X-Spamd-Bar: +++++++++ X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-5.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-5.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 2/4] commands: Fix tst_brk TFAIL 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" It needs to be replaced with tst_res TFAIL and return Fixes: 1878502f6 ("tst_test.sh/tst_brk(): Allow only TBROK and TCONF") Signed-off-by: Petr Vorel --- testcases/commands/gzip/gzip_tests.sh | 3 ++- testcases/commands/mv/mv_tests.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/testcases/commands/gzip/gzip_tests.sh b/testcases/commands/gzip/gzip_tests.sh index fdc933ea2..3262c555b 100755 --- a/testcases/commands/gzip/gzip_tests.sh +++ b/testcases/commands/gzip/gzip_tests.sh @@ -82,7 +82,8 @@ test1() gzip -r tst_gzip.tmp > tst_gzip.err 2>&1 if [ $? -ne 0 ]; then cat tst_gzip.err - tst_brk TFAIL "Test #1: gzip -r failed" + tst_res TFAIL "Test #1: gzip -r failed" + return fi tst_res TINFO "Test #1: creating output file" diff --git a/testcases/commands/mv/mv_tests.sh b/testcases/commands/mv/mv_tests.sh index 91648dd8f..ae8b8701d 100755 --- a/testcases/commands/mv/mv_tests.sh +++ b/testcases/commands/mv/mv_tests.sh @@ -88,7 +88,8 @@ test1() mv tst_mv.old tst_mv.new > tst_mv.err 2>&1 if [ $? -ne 0 ]; then cat tst_mv.err - tst_brk TFAIL "Test #1: 'mv tst_mv.old tst_mv.new' failed" + tst_res TFAIL "Test #1: 'mv tst_mv.old tst_mv.new' failed" + return fi tst_res TINFO "Test #1: creating output file" From patchwork Tue Jan 23 16:26:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1889801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=0HdfBQOo; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=CJHX6GlE; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=0HdfBQOo; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=CJHX6GlE; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (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 legolas.ozlabs.org (Postfix) with ESMTPS id 4TKCDn0htvz1yS7 for ; Wed, 24 Jan 2024 03:27:53 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 21DB93CFA8F for ; Tue, 23 Jan 2024 17:27:51 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it 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 296293CE21C for ; Tue, 23 Jan 2024 17:26:56 +0100 (CET) Authentication-Results: in-7.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=195.135.223.130; helo=smtp-out1.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 5FA0320B4C1 for ; Tue, 23 Jan 2024 17:26:55 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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-out1.suse.de (Postfix) with ESMTPS id AE84A220C2; Tue, 23 Jan 2024 16:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027214; 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=8Cc24SU0ZmqvnypboNZPqFy7EUvtkaoksAlrrPciSrg=; b=0HdfBQOoZ1GewX6S+JvhOP1uKpk6Ifb9K++Dp2TzSnS7AQDG0hdoQR/yj7IuvEmnetJU5m JyDlSNAye9sF4I3dNDXRyTUFq/xopQhzj3f3hBqJTOy3z4zGKb51+QlX4AoS03745VUlcw 8Z8TVT8Z2JUNxEznu5ddKz0zIZAU8GA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027214; 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=8Cc24SU0ZmqvnypboNZPqFy7EUvtkaoksAlrrPciSrg=; b=CJHX6GlEmo+Q2mOACt5T3lZglH0YNOZqegi/mwhEB0XDmdXnC9CPfL6clGk/FaDtyBVgdP UewvG+H38lwd7dCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027214; 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=8Cc24SU0ZmqvnypboNZPqFy7EUvtkaoksAlrrPciSrg=; b=0HdfBQOoZ1GewX6S+JvhOP1uKpk6Ifb9K++Dp2TzSnS7AQDG0hdoQR/yj7IuvEmnetJU5m JyDlSNAye9sF4I3dNDXRyTUFq/xopQhzj3f3hBqJTOy3z4zGKb51+QlX4AoS03745VUlcw 8Z8TVT8Z2JUNxEznu5ddKz0zIZAU8GA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027214; 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=8Cc24SU0ZmqvnypboNZPqFy7EUvtkaoksAlrrPciSrg=; b=CJHX6GlEmo+Q2mOACt5T3lZglH0YNOZqegi/mwhEB0XDmdXnC9CPfL6clGk/FaDtyBVgdP UewvG+H38lwd7dCA== 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 922BE139B1; Tue, 23 Jan 2024 16:26:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id MMBmIc3or2V+CwAAD6G6ig (envelope-from ); Tue, 23 Jan 2024 16:26:53 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Tue, 23 Jan 2024 17:26:46 +0100 Message-ID: <20240123162647.210424-4-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240123162647.210424-1-pvorel@suse.cz> References: <20240123162647.210424-1-pvorel@suse.cz> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Level: X-Spam-Score: 0.73 X-Spamd-Result: default: False [0.73 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[6]; NEURAL_HAM_LONG(-0.99)[-0.993]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.18)[-0.879]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-7.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 3/4] kernel: Fix tst_brk TFAIL 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" It needs to be replaced with tst_res TFAIL and return Fixes: 1878502f6 ("tst_test.sh/tst_brk(): Allow only TBROK and TCONF") Signed-off-by: Petr Vorel --- .../cpuset/cpuset_regression_test.sh | 18 +++++++---- .../kernel/device-drivers/zram/zram01.sh | 3 +- .../kernel/device-drivers/zram/zram_lib.sh | 30 ++++++++++++------- .../fs/quota_remount/quota_remount_test01.sh | 3 +- .../security/integrity/ima/tests/ima_tpm.sh | 3 +- 5 files changed, 38 insertions(+), 19 deletions(-) diff --git a/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh b/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh index a5757309f..bedc48110 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_regression_test.sh @@ -190,21 +190,27 @@ do_test() ROD_SILENT mkdir ${root_cpuset_dir}/testdir # Creat an exclusive cpuset. - echo 1 > ${root_cpuset_dir}/testdir/${cpu_exclusive} - [ $? -ne 0 ] && tst_brk TFAIL "'echo 1 > ${root_cpuset_dir}/testdir/${cpu_exclusive}' failed" + if ! echo 1 > ${root_cpuset_dir}/testdir/${cpu_exclusive}; then + tst_res TFAIL "'echo 1 > ${root_cpuset_dir}/testdir/${cpu_exclusive}' failed" + return + fi cpu_exclusive_tmp=$(cat ${root_cpuset_dir}/testdir/${cpu_exclusive}) if [ "${cpu_exclusive_tmp}" != "1" ]; then - tst_brk TFAIL "${cpu_exclusive} is '${cpu_exclusive_tmp}', expected '1'" + tst_res TFAIL "${cpu_exclusive} is '${cpu_exclusive_tmp}', expected '1'" + return fi # This may trigger the kernel crash - echo 0 > ${root_cpuset_dir}/testdir/${cpus} - [ $? -ne 0 ] && tst_brk TFAIL "'echo 0 > ${root_cpuset_dir}/testdir/${cpus}' failed" + if ! echo 0 > ${root_cpuset_dir}/testdir/${cpus}; then + tst_res TFAIL "'echo 0 > ${root_cpuset_dir}/testdir/${cpus}' failed" + return + fi cpus_value=$(cat ${root_cpuset_dir}/testdir/${cpus}) if [ "${cpus_value}" != "0" ]; then - tst_brk TFAIL "${cpus} is '${cpus_value}', expected '0'" + tst_res TFAIL "${cpus} is '${cpus_value}', expected '0'" + return fi tst_res TPASS "Bug is not reproducible" diff --git a/testcases/kernel/device-drivers/zram/zram01.sh b/testcases/kernel/device-drivers/zram/zram01.sh index 6bc305f2c..234bf06dd 100755 --- a/testcases/kernel/device-drivers/zram/zram01.sh +++ b/testcases/kernel/device-drivers/zram/zram01.sh @@ -82,7 +82,8 @@ zram_makefs() mkfs.$fs /dev/zram$i > err.log 2>&1 if [ $? -ne 0 ]; then cat err.log - tst_brk TFAIL "failed to make $fs on /dev/zram$i" + tst_res TFAIL "failed to make $fs on /dev/zram$i" + return fi i=$(($i + 1)) diff --git a/testcases/kernel/device-drivers/zram/zram_lib.sh b/testcases/kernel/device-drivers/zram/zram_lib.sh index e94d7db11..e94f9244d 100755 --- a/testcases/kernel/device-drivers/zram/zram_lib.sh +++ b/testcases/kernel/device-drivers/zram/zram_lib.sh @@ -108,12 +108,16 @@ zram_max_streams() for max_s in $zram_max_streams; do local sys_path="/sys/block/zram${i}/max_comp_streams" - echo $max_s > $sys_path || \ - tst_brk TFAIL "failed to set '$max_s' to $sys_path" + if ! echo $max_s > $sys_path; then + tst_res TFAIL "failed to set '$max_s' to $sys_path" + return + fi local max_streams=$(cat $sys_path) - [ "$max_s" -ne "$max_streams" ] && \ - tst_brk TFAIL "can't set max_streams '$max_s', get $max_stream" + if [ "$max_s" -ne "$max_streams" ]; then + tst_res TFAIL "can't set max_streams '$max_s', get $max_stream" + return + fi i=$(($i + 1)) tst_res TINFO "$sys_path = '$max_streams'" @@ -140,8 +144,10 @@ zram_compress_alg() for i in $(seq $dev_start $dev_end); do for alg in $algs; do local sys_path="/sys/block/zram${i}/comp_algorithm" - echo "$alg" > $sys_path || \ - tst_brk TFAIL "can't set '$alg' to $sys_path" + if ! echo "$alg" > $sys_path; then + tst_res TFAIL "can't set '$alg' to $sys_path" + return + fi tst_res TINFO "$sys_path = '$alg'" done done @@ -157,8 +163,10 @@ zram_set_disksizes() tst_res TINFO "set disk size to zram device(s)" for ds in $zram_sizes; do local sys_path="/sys/block/zram${i}/disksize" - echo "$ds" > $sys_path || \ - tst_brk TFAIL "can't set '$ds' to $sys_path" + if ! echo "$ds" > $sys_path; then + tst_res TFAIL "can't set '$ds' to $sys_path" + return + fi i=$(($i + 1)) tst_res TINFO "$sys_path = '$ds'" @@ -183,8 +191,10 @@ zram_set_memlimit() for ds in $zram_mem_limits; do local sys_path="/sys/block/zram${i}/mem_limit" - echo "$ds" > $sys_path || \ - tst_brk TFAIL "can't set '$ds' to $sys_path" + if ! echo "$ds" > $sys_path; then + tst_res TFAIL "can't set '$ds' to $sys_path" + return + fi i=$(($i + 1)) tst_res TINFO "$sys_path = '$ds'" diff --git a/testcases/kernel/fs/quota_remount/quota_remount_test01.sh b/testcases/kernel/fs/quota_remount/quota_remount_test01.sh index 25d9f8fcc..7e20b3608 100755 --- a/testcases/kernel/fs/quota_remount/quota_remount_test01.sh +++ b/testcases/kernel/fs/quota_remount/quota_remount_test01.sh @@ -67,7 +67,8 @@ do_test() newblocks=$(get_blocks) if [ $blocks -eq $newblocks ]; then - tst_brk TFAIL "usage did not change after remount" + tst_res TFAIL "usage did not change after remount" + return fi tst_res TPASS "quota on remount passed" diff --git a/testcases/kernel/security/integrity/ima/tests/ima_tpm.sh b/testcases/kernel/security/integrity/ima/tests/ima_tpm.sh index b675a20a1..2a28562e6 100755 --- a/testcases/kernel/security/integrity/ima/tests/ima_tpm.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_tpm.sh @@ -159,7 +159,8 @@ get_pcr10_aggregate() $cmd > hash.txt 2>&1 ret=$? elif [ $ret -ne 0 -a "$MISSING_EVMCTL" = 1 ]; then - tst_brk TFAIL "evmctl failed $msg" + tst_res TFAIL "evmctl failed $msg" + return fi [ $ret -ne 0 ] && tst_res TWARN "evmctl failed, trying to continue $msg" From patchwork Tue Jan 23 16:26:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1889802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=IzalHpHD; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=NOGLNHBg; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=IzalHpHD; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=NOGLNHBg; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (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 legolas.ozlabs.org (Postfix) with ESMTPS id 4TKCF54WVxz1yS7 for ; Wed, 24 Jan 2024 03:28:09 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A00EB3CFB72 for ; Tue, 23 Jan 2024 17:28:07 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::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 1514B3CEE6D for ; Tue, 23 Jan 2024 17:26:58 +0100 (CET) Authentication-Results: in-7.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=195.135.223.131; helo=smtp-out2.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 413F8206C3F for ; Tue, 23 Jan 2024 17:26:56 +0100 (CET) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 2D8511F79E; Tue, 23 Jan 2024 16:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027216; 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=KjguCVNPMRhwfV2eHD03VN9yeZBMfpAWwPB8EpLDDf0=; b=IzalHpHDKdsGjd8Z5WSMwjVN9/fznv7PfM+GDbcZEKuDkbEnwk0Qobhb21Waxdhpu3NGGQ cKeuCuCBpoPC9xRFpBe5r1R3AKkBDwh1mh/621ffF6UT709GFPUK31enfwazOpdO19GNr0 1d9/9K5hxKZhG2hIRLtqTL4XTuwz2qU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027216; 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=KjguCVNPMRhwfV2eHD03VN9yeZBMfpAWwPB8EpLDDf0=; b=NOGLNHBgcJvC1foJ55v+S7rpd8TTblm4oZSJqceSJts/zVlHGluZNPHTgMsuvcC+lbJeb5 C9lVvA2UKlbAUTAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706027216; 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=KjguCVNPMRhwfV2eHD03VN9yeZBMfpAWwPB8EpLDDf0=; b=IzalHpHDKdsGjd8Z5WSMwjVN9/fznv7PfM+GDbcZEKuDkbEnwk0Qobhb21Waxdhpu3NGGQ cKeuCuCBpoPC9xRFpBe5r1R3AKkBDwh1mh/621ffF6UT709GFPUK31enfwazOpdO19GNr0 1d9/9K5hxKZhG2hIRLtqTL4XTuwz2qU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706027216; 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=KjguCVNPMRhwfV2eHD03VN9yeZBMfpAWwPB8EpLDDf0=; b=NOGLNHBgcJvC1foJ55v+S7rpd8TTblm4oZSJqceSJts/zVlHGluZNPHTgMsuvcC+lbJeb5 C9lVvA2UKlbAUTAQ== 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 D18E913786; Tue, 23 Jan 2024 16:26:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id CCRHLc7or2V+CwAAD6G6ig (envelope-from ); Tue, 23 Jan 2024 16:26:54 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Tue, 23 Jan 2024 17:26:47 +0100 Message-ID: <20240123162647.210424-5-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240123162647.210424-1-pvorel@suse.cz> References: <20240123162647.210424-1-pvorel@suse.cz> MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [1.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Score: 1.90 X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-7.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-7.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 4/4] network: Fix tst_brk TFAIL 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: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" It needs to be replaced with tst_res TFAIL and return Fixes: 1878502f6 ("tst_test.sh/tst_brk(): Allow only TBROK and TCONF") Signed-off-by: Petr Vorel --- testcases/network/nfs/nfs_stress/nfs06.sh | 5 ++++- testcases/network/stress/route/route-lib.sh | 8 +++++-- testcases/network/stress/ssh/ssh-stress.sh | 16 ++++++++++---- testcases/network/tcp_cmds/host/host01.sh | 5 +++-- .../network/tcp_cmds/ipneigh/ipneigh01.sh | 21 ++++++++++++------- testcases/network/virt/virt_lib.sh | 12 +++++++---- testcases/network/xinetd/xinetd_tests.sh | 7 ++++--- 7 files changed, 50 insertions(+), 24 deletions(-) diff --git a/testcases/network/nfs/nfs_stress/nfs06.sh b/testcases/network/nfs/nfs_stress/nfs06.sh index 560df05b1..09e55fe34 100755 --- a/testcases/network/nfs/nfs_stress/nfs06.sh +++ b/testcases/network/nfs/nfs_stress/nfs06.sh @@ -34,7 +34,10 @@ do_test() tst_res TINFO "waiting for pids:$pids" for p in $pids; do - wait $p || tst_brk TFAIL "fsstress process failed" + if ! wait $p; then + tst_res TFAIL "fsstress process failed" + return + fi tst_res TINFO "fsstress '$p' completed" done pids= diff --git a/testcases/network/stress/route/route-lib.sh b/testcases/network/stress/route/route-lib.sh index 163c15423..29aa2e913 100644 --- a/testcases/network/stress/route/route-lib.sh +++ b/testcases/network/stress/route/route-lib.sh @@ -97,10 +97,14 @@ test_netlink() tst_res TINFO "running $cmd $opt" $cmd $opt || ret=$? if [ "$ret" -ne 0 ]; then - [ $((ret & 3)) -ne 0 ] && \ - tst_brk TFAIL "$cmd failed" + if [ $((ret & 3)) -ne 0 ]; then + tst_res TFAIL "$cmd failed" + return + fi + [ $((ret & 32)) -ne 0 ] && \ tst_brk TCONF "not supported configuration" + [ $((ret & 4)) -ne 0 ] && \ tst_res TWARN "$cmd has warnings" fi diff --git a/testcases/network/stress/ssh/ssh-stress.sh b/testcases/network/stress/ssh/ssh-stress.sh index e7c4d45ce..c27c27a28 100755 --- a/testcases/network/stress/ssh/ssh-stress.sh +++ b/testcases/network/stress/ssh/ssh-stress.sh @@ -93,8 +93,10 @@ IdentityFile $TST_TMPDIR/id_rsa\n\" > $RHOST_SSH_CONF" test_ssh_connectivity() { - tst_rhost_run -c "$RHOST_SSH 'true >/dev/null 2>&1' >/dev/null" - [ $? -ne 0 ] && tst_brk TFAIL "SSH not reachable" + if ! tst_rhost_run -c "$RHOST_SSH 'true >/dev/null 2>&1' >/dev/null"; then + tst_res TFAIL "SSH not reachable" + return + fi } test1() @@ -121,7 +123,10 @@ test1() [ $? -ne 0 ] && num=$((num + 1)) done - [ $num -ne 0 ] && tst_brk TFAIL "$num ssh processes died unexpectedly during execution" + if [ $num -ne 0 ]; then + tst_res TFAIL "$num ssh processes died unexpectedly during execution" + return + fi test_ssh_connectivity @@ -216,7 +221,10 @@ test3() # Setup an ssh tunnel from the remote host to testhost tst_rhost_run -c "$RHOST_SSH -f -N -L $lport:$rhost:$port /dev/null 2>&1" - [ "$?" -ne 0 ] && tst_brk TFAIL "Failed to create an SSH session with port forwarding" + if [ "$?" -ne 0 ]; then + tst_res TFAIL "Failed to create an SSH session with port forwarding" + return + fi RHOST_PIDS=$(tst_rhost_run -c "pgrep -f '^ssh .*$lport:$rhost:$port'") # Start the TCP traffic clients diff --git a/testcases/network/tcp_cmds/host/host01.sh b/testcases/network/tcp_cmds/host/host01.sh index 6a4067495..9ed44bae3 100755 --- a/testcases/network/tcp_cmds/host/host01.sh +++ b/testcases/network/tcp_cmds/host/host01.sh @@ -21,11 +21,12 @@ do_test() if addr=$(host $lhost); then addr=$(echo "$addr" | grep address | tail -1 | awk '{print $NF}') if [ -z "$addr" ]; then - tst_brk TFAIL "empty address" + tst_res TFAIL "empty address" + return fi EXPECT_PASS host $addr \>/dev/null else - tst_brk TFAIL "host $lhost on local machine failed" + tst_res TFAIL "host $lhost on local machine failed" fi } diff --git a/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh b/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh index e67ff5cc8..4b818357e 100755 --- a/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh +++ b/testcases/network/tcp_cmds/ipneigh/ipneigh01.sh @@ -57,8 +57,10 @@ do_test() for i in $(seq 1 $NUMLOOPS); do - ping$TST_IPV6 -q -c1 $(tst_ipaddr rhost) -I $(tst_iface) > /dev/null || \ - tst_brk TFAIL "cannot ping $(tst_ipaddr rhost)" + if ! ping$TST_IPV6 -q -c1 $(tst_ipaddr rhost) -I $(tst_iface) > /dev/null; then + tst_res TFAIL "cannot ping $(tst_ipaddr rhost)" + return + fi local k local ret=1 @@ -66,19 +68,22 @@ do_test() $SHOW_CMD | grep -q $(tst_ipaddr rhost) if [ $? -eq 0 ]; then ret=0 - break; + break fi tst_sleep 100ms done - [ "$ret" -ne 0 ] && \ - tst_brk TFAIL "$entry_name entry '$(tst_ipaddr rhost)' not listed" + if [ "$ret" -ne 0 ]; then + tst_res TFAIL "$entry_name entry '$(tst_ipaddr rhost)' not listed" + return + fi $DEL_CMD - $SHOW_CMD | grep -q "$(tst_ipaddr rhost).*$(tst_hwaddr rhost)" && \ - tst_brk TFAIL "'$DEL_CMD' failed, entry has " \ - "$(tst_hwaddr rhost)' $i/$NUMLOOPS" + if $SHOW_CMD | grep -q "$(tst_ipaddr rhost).*$(tst_hwaddr rhost)"; then + tst_res TFAIL "'$DEL_CMD' failed, entry has $(tst_hwaddr rhost)' $i/$NUMLOOPS" + return + fi done tst_res TPASS "verified adding/removing $entry_name cache entry" diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh index d7e694eb7..0aadbfdb9 100644 --- a/testcases/network/virt/virt_lib.sh +++ b/testcases/network/virt/virt_lib.sh @@ -174,8 +174,10 @@ virt_multiple_add_test() tst_res TINFO "add $NS_TIMES $virt_type, then delete" for i in $(seq $start_id $max); do - virt_add ltp_v$i id $i $opt || \ - tst_brk TFAIL "failed to create 'ltp_v0 $opt'" + if ! virt_add ltp_v$i id $i $opt; then + tst_res TFAIL "failed to create 'ltp_v0 $opt'" + return + fi ROD_SILENT "ip link set ltp_v$i up" done @@ -196,8 +198,10 @@ virt_add_delete_test() tst_res TINFO "add/del $virt_type $NS_TIMES times" for i in $(seq 0 $max); do - virt_add ltp_v0 $opt || \ - tst_brk TFAIL "failed to create 'ltp_v0 $opt'" + if ! virt_add ltp_v0 $opt; then + tst_res TFAIL "failed to create 'ltp_v0 $opt'" + return + fi ROD_SILENT "ip link set ltp_v0 up" ROD_SILENT "ip link delete ltp_v0" done diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh index 505dae5d7..25ec91d26 100755 --- a/testcases/network/xinetd/xinetd_tests.sh +++ b/testcases/network/xinetd/xinetd_tests.sh @@ -91,9 +91,10 @@ xinetd_test() for a in $check_addr; do p=$(echo $pattern | sed "s/ADDR/$a/") - echo '' | telnet $a 2>&1 | grep -qiE "$p" - [ $? -ne 0 ] && \ - tst_brk TFAIL "not expected output for 'telnet $a'" + if ! echo '' | telnet $a 2>&1 | grep -qiE "$p"; then + tst_res TFAIL "not expected output for 'telnet $a'" + return + fi done tst_res TPASS "expected output with telnet $desc" }