From patchwork Thu Jun 20 10:37:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3742 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a501:b0:57d:b2cb:6cf with SMTP id hh1csp727850mab; Thu, 20 Jun 2024 03:38:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW9h2/G0R2rtmAqpxIHPghdo3ywq+z2DFsEWHyRT1dN/TS7QyQ7kYv3AUNBuVlsP0S4FP1BJj5QFKtNWRw2FnjXlnqZbik= X-Google-Smtp-Source: AGHT+IFX2oO4gW7olP20NxpqZsxDOOnWfFHAJnhJrdpnJVfXqSiSaJq7weqDhOC9NsxFsCMTHTDa X-Received: by 2002:a05:6a00:84e:b0:705:daf0:9004 with SMTP id d2e1a72fcca58-70629cebc0amr4876345b3a.3.1718879910046; Thu, 20 Jun 2024 03:38:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718879910; cv=none; d=google.com; s=arc-20160816; b=kOaOp8Ll3FTXcYTaay7MdSRSPvKKmif0lxWOYUbNqcsjzvWty0OYuGMVt8k+nxga5d yAsetuxZEA2YgnrszUbwMzEfQGSKuwLfkKD0UOq7Z5AiSmoxRTA216+As6WBiptXPLjJ DCRV2pmpuFd+aiFFbGXl+DLXoVxi/D0lCBjEo7vuQIVBULozbKCjRZc32ql4Dkdscyz5 dTl7yv+9iFEwvCnMWGJfhHp8K6CrIJYrr0OoY5qYDZFD0A7NRL3QIYUden29Ob0BKRWw ZCsl6VsyspH5QRHMGaR/mrIBCP8JAV3YVHTDw5dsqzd32Zt83yuEckSV5hAPAZBA697b s3YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=TDPW42dMhiOu0DE9rryXVAdiyixf/OXYhGUA+/bVUk8=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=WcDhGeJQkV4YP4oV22BJgHiKCPYbB7sYzopXJu91DHqIP/nBGYonMdjzD4wAY6cGGH R0mDq08Jmq6WPgV12FCc+/fCwf2VPozhlq6E+Ys8g0hGx9PdglErpp18rma34NVQhI+/ P5uadllbQpUSiSmu5gUSBu6CKQpcKap3t3jGQlHJ/m6AFV5y2dXdIv8TdUFsr8PXUl9p N/diFQxCZ8PK3rtTEtMw0h9N7GdeytYwEOD4x9mhSJcTLHrJBa0nHj3yhKux/MBaeWsV 3mqoFCMIyhyy9YZAEZz7TqMg9nM5HaQoDWvmxr/YhxLRf05K9PHwX34ozpxrWKHNTM3L tDAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=hJ133P3T; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=JYEM6Nhm; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 41be03b00d2f7-70f631c2c05si3870605a12.430.2024.06.20.03.38.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2024 03:38:30 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=hJ133P3T; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=JYEM6Nhm; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1sKFBD-0002NS-IN; Thu, 20 Jun 2024 10:38:10 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sKFB3-0002N7-Ob for openvpn-devel@lists.sourceforge.net; Thu, 20 Jun 2024 10:38:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8dM7ek9RR355AHOIYzq0nJ2GOxydbKkIjc2IAGF/CNQ=; b=hJ133P3TLuWCKjdF7rEUiEwt8K pAFgb6hyTJA2mTLqWP45vziQKBi5r/9Uyggcf0hdX4rJCnZQM75kQtuDlHMiHgDfLsxz8AjjJlfgi SInaftQDj/6XexJVCQ6Kbu5a+qe6X0BeIb79NHPnewi3t6N3In/BsSYq0lb5BGU7xdLY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=8dM7ek9RR355AHOIYzq0nJ2GOxydbKkIjc2IAGF/CNQ=; b=JYEM6Nhm82iJCukP1J1Oqw5FLS qXQTjXdxmbyr0Op0oS3D5lTX1EpcJJL+ReBsjEYxsb6RDOgMfHKUO3VQBedpY5fRIUHuiHjTYQKZ6 qzm4yGUm8KeKFiO/zdRwcBybf7hqoQiGpiqxkTWj/BSjHYTivDrYb81ze63KBrYvF5ro=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1sKFB0-00046b-9T for openvpn-devel@lists.sourceforge.net; Thu, 20 Jun 2024 10:37:59 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 45KAboYE007933 for ; Thu, 20 Jun 2024 12:37:50 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 45KAboO5007932 for openvpn-devel@lists.sourceforge.net; Thu, 20 Jun 2024 12:37:50 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 20 Jun 2024 12:37:48 +0200 Message-ID: <20240620103749.7923-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.44.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22util-spamd-1=2Ev13=2Elw=2Esourceforge=2Ecom=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Frank_Lichtenheld_=3Cfrank=40l?= =?unknown-8bit?q?ichtenheld=2Ecom=3E_The_changes?= =?unknown-8bit?q?_for_POSIX_shell_compatibility_and_parallel_make_compatibil?= =?unknown-8bit?q?ity_broke_actually?= =?unknown-8bit?q?_failing_the_test_when_a_subtest_fails=2E_Change-Id=3A_I35f?= =?unknown-8bit?q?7cf84e035bc793d6f0f59e46edf1a2efe0391?= =?unknown-8bit?q?_Signed-off-by=3A_Frank_Lichtenheld_=3Cfrank=40lichtenheld?= =?unknown-8bit?q?=2Ecom=3E_Acked-by=3A_Samuli?= =?unknown-8bit?q?_Sepp=C3=A4nen_=3Csamuli=40openvpn=2Enet=3E_---_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E0_points=2C_6=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_0=2E0_URIBL=5FBLOCKED__________ADMINISTRATOR_NOTICE=3A_The?= =?unknown-8bit?q?_query_to_URIBL_was?= =?unknown-8bit?q?_blocked=2E__See?= =?unknown-8bit?q?_http=3A//wiki=2Eapache=2Eorg/spamassassin/DnsBlocklists=23?= =?unknown-8bit?q?dnsbl-block?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5BURIs=3A_openvpn=2Enet=5D?= =?unknown-8bit?q?_0=2E0_RCVD=5FIN=5FVALIDITY=5FRPBL=5FBLOCKED_RBL=3A_ADMINIS?= =?unknown-8bit?q?TRATOR_NOTICE=3A_The?= =?unknown-8bit?q?_query_to_Validity_was_blocked=2E__See?= =?unknown-8bit?q?_https=3A//knowledge=2Evalidity=2Ecom/hc/en-us/articles/209?= =?unknown-8bit?q?61730681243?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5B193=2E149=2E48=2E174_listed_in_bl=2Escore=2Esenderscore?= =?unknown-8bit?q?=2Ecom=5D?= =?unknown-8bit?q?_0=2E0_RCVD=5FIN=5FVALIDITY=5FSAFE=5FBLOCKED_RBL=3A_ADMINIS?= =?unknown-8bit?q?TRATOR_NOTICE=3A_The?= =?unknown-8bit?q?_query_to_Validity_was_blocked=2E__See?= =?unknown-8bit?q?_https=3A//knowledge=2Evalidity=2Ecom/hc/en-us/articles/209?= =?unknown-8bit?q?61730681243?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5B193=2E149=2E48=2E174_listed_in_sa-trusted=2Ebondedsende?= =?unknown-8bit?q?r=2Eorg=5D?= =?unknown-8bit?q?_0=2E0_RCVD=5FIN=5FDNSWL=5FBLOCKED__RBL=3A_ADMINISTRATOR_NO?= =?unknown-8bit?q?TICE=3A_The_query_to?= =?unknown-8bit?q?_DNSWL_was_blocked=2E__See?= =?unknown-8bit?q?_http=3A//wiki=2Eapache=2Eorg/spamassassin/DnsBlocklists=23?= =?unknown-8bit?q?dnsbl-block?= =?unknown-8bit?q?_for_more_information=2E?= =?unknown-8bit?q?_=5B193=2E149=2E48=2E174_listed_in_list=2Ednswl=2Eorg=5D?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E0_SPF=5FHELO=5FPASS__________SPF=3A_HELO_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E0_T=5FSCC=5FBODY=5FTEXT=5FLINE___No_description_avail?= =?unknown-8bit?q?able=2E?= X-Headers-End: 1sKFB0-00046b-9T Subject: [Openvpn-devel] [PATCH v1] t_server_null.sh: Fix failure case X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1802376220542053171?= X-GMAIL-MSGID: =?utf-8?q?1802376220542053171?= From: Frank Lichtenheld The changes for POSIX shell compatibility and parallel make compatibility broke actually failing the test when a subtest fails. Change-Id: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391 Signed-off-by: Frank Lichtenheld Acked-by: Samuli Seppänen --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/668 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Samuli Seppänen diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh index cfca5ee..0e53ba4 100755 --- a/tests/t_server_null.sh +++ b/tests/t_server_null.sh @@ -64,9 +64,12 @@ fi "${srcdir}/t_server_null_client.sh" +retval=$? # When running make jobs in parallel ("make -j check") we need to ensure # that this script does not exit before all --dev null servers are dead and # their network interfaces are gone. Otherwise t_client.sh will fail because # pre and post ifconfig output does not match. wait + +exit $retval diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh index 5d5542b..8890007 100755 --- a/tests/t_server_null_client.sh +++ b/tests/t_server_null_client.sh @@ -130,7 +130,7 @@ eval test_name=\"\$TEST_NAME_$SUF\" eval should_pass=\"\$SHOULD_PASS_$SUF\" - (get_client_test_result "${test_name}" "${should_pass}") + get_client_test_result "${test_name}" "${should_pass}" done exit $retval