From patchwork Wed Jun 19 16:28:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3741 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:a501:b0:57d:b2cb:6cf with SMTP id hh1csp371263mab; Wed, 19 Jun 2024 09:28:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUrBfZUgBU7ny0yQm1kMU9dg2Q/QocSv2tQw54zgh6WONPtOOPIMZiWXi+TcLvV+21L3TQ5xw5RM4wfgaBjpb/ziSkhNNo= X-Google-Smtp-Source: AGHT+IEBRpBA9WB4B5fd2r8B+aWpa5xOnyD/ZcQ5XsDCNwPRA7aC7o00Wk81BKLlRNptpROdrMRj X-Received: by 2002:a17:90a:6787:b0:2c7:ad55:85d8 with SMTP id 98e67ed59e1d1-2c7b5d76cabmr2889558a91.2.1718814524610; Wed, 19 Jun 2024 09:28:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718814524; cv=none; d=google.com; s=arc-20160816; b=vmujtKN7ggcfh4Selcl8qVq2L/BjQpake+SlozsTZWV0JFZp2cEh1/fHyzEB7uvp6f ZSD0HhH0LaKuvcHoCsGFj5IrpAsIa7684LaGiNc3czCCV3L0Tvs9FnbcUGAHXal7DT0W nR3EMTrSCHGZZBtRseQYqsygpHEfAVwHQJQPidhYp9BQoUg0UlZPcLn3gZdKW/kCBIVZ TYKN92ldTaE3lZe0WcpMPm1iGuiNsrQcQmeyQ23htIe2WnD/LSSN9NqsjKFxHcYbC956 3aBL7+tkST8Piyv6jHel7Su+EN0Y0cBPh8vw2RpMD5me4di0I5VwC3TKf9WzZJ/mHjXU cpIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=WbzpqKmA+97FyDOGbKSiTUYu4YQo6agzhktOInPQHlY=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=l1s0lnAh5Rrpj9Ttzd7rOY3gsPjdOTogYAUcy0Uy8fKlGu81LhYUuRCSh2kMkgpVWX HvURBErJY0UHhH0to2u87DQ1jPMcFP4k8X6KubjhmGbDXR3gusCZpynxCUaA4VcDLmfH p+BaBp0TOEAaFxFicUPxQKPVClXgBN1LhZxkpJp4tKFNZUKIgYHFUhc45pzZadrGjzgv dtG56EQEP3klgQ/RhpKBO7I4IEeUS+V2LYL+3WHnSTPGuD4Yq0KGMkcYO/qcTtY195FE cDdWFlUB5rS1j+9gFvAIbmR5ENF8iejFDtJzB1dO2lUR9carW7QZ285lqeuCpPeOImt6 VOXw==; 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=Yugd08Bu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hFskIU9E; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=d0aepi8n; 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=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2c4c47b036esi13357525a91.165.2024.06.19.09.28.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jun 2024 09:28:44 -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=Yugd08Bu; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=hFskIU9E; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=d0aepi8n; 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=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1sJyAQ-0005ef-Ac; Wed, 19 Jun 2024 16:28:14 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1sJyAP-0005eW-3X for openvpn-devel@lists.sourceforge.net; Wed, 19 Jun 2024 16:28:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XvjOveYcOF7fl7+UDYBBD41o19FHLdEIAMFS+Ra8qpk=; b=Yugd08BuFtPif5tbGS6xCR8dAs +g+Zle7IthryS9IMKFBFXLxm/Cs3c+JuDQ2AB51Gpi8MVKws+KlnJHIuPE+0hqItCZN1AAiShZEjA EszI7OwAew0XNM+b6jf4mg9g2GODN36TDLLTtP4J6jgMsW6HWZtkeplrIlqrc663jM3E=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=XvjOveYcOF7fl7+UDYBBD41o19FHLdEIAMFS+Ra8qpk=; b=h FskIU9E82+QO0X9FpJ3bI7igwXVVsWMw0kzJ4XV5dHY+5IRMyyQRdW25kFFfEyDJozKndICrLmlT4 iPhHo4K+v2eZstuqhqEmzuPv2Xf7k/12yelBu6zSAiRJmTleWEDJhhagdqtgPDw1SIU+32euF7ixt udMHL3QibPCHZ71Y=; Received: from mail-wr1-f52.google.com ([209.85.221.52]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1sJyAP-0005zF-5s for openvpn-devel@lists.sourceforge.net; Wed, 19 Jun 2024 16:28:13 +0000 Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-356c4e926a3so6420696f8f.1 for ; Wed, 19 Jun 2024 09:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1718814486; x=1719419286; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=XvjOveYcOF7fl7+UDYBBD41o19FHLdEIAMFS+Ra8qpk=; b=d0aepi8nZwCMoDae1cEOgOJ7nWzCIzwWVIPK0AEE+GpyrbUV4XD8bv+6FUyw1BUwb8 dS+hpjq9aOG3IxHiqXHKmqDJ/07W2ARmZVrHwWdeliMTmNXhKR4Du2TTl78Y0sMY5J5x hKUibvElq825Dyi5VYMyTZZ9dxePBqOmtkjXiZux2zse+L7qBjvyXjjeKlAOOt9KI5NQ CWSmLdXGv1QoMqthKitO2kCCsUGXKXzDT1J5gSyYS7b7BANIbmPdNEPKCeMG1V5cmMDi 3SlD7pYiXw5ljMR/nH4/YbZUXvcFSD4ehrqAoOqsc8+UzsZBlsjWMvnOaZoTLFwDnT6C i89A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718814486; x=1719419286; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XvjOveYcOF7fl7+UDYBBD41o19FHLdEIAMFS+Ra8qpk=; b=fl7pM1MLm10U7iU+xje0ZEBPOa2YrGASaTBH2MA6A4pGf+Mpjp1oFyD7RugrnLGX7E exCXDYERjA/928vjnaTFwhqrB5/TDLbPJqXpff7O6xYizDT+pPkJ1v9F5gjdT5nB4ALP 6R2rx/w3KyIv/mooNoO2VIBhNz3Kc0uzK6XCiL8ZLnEAGZPrJDO3QpT29cHoECiMX2Yn JDc9oVs6pB/gPheqCqfTsUvRHYtRvyKmQz+D3uJpLGf3/wF7PNn0MekDZ7cyW6YAdDMz 45RfzYPbvGqPfagJCKBpDez/adEPXi0sKupJj/9gVqNpSaVUUqVnFR0gLaoy6AhnLkJx X6tw== X-Gm-Message-State: AOJu0Yy9nThGmDKeLavwcJ7KNz19tlx6rjjtpLy0M72A1lzVmCEtJRfQ rAnIhGZTsJZdppqgY/AEkFUGbbJBO5fyrELK2rllQCdWLaMth8gXEUJ1E8buAkKhYgkx6ELCR7r d X-Received: by 2002:adf:eec3:0:b0:363:10cb:1fc3 with SMTP id ffacd0b85a97d-363175b8261mr2485331f8f.20.1718814485538; Wed, 19 Jun 2024 09:28:05 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-360917c264bsm10334873f8f.56.2024.06.19.09.28.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 09:28:05 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Wed, 19 Jun 2024 16:28:04 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I35f7cf84e035bc793d6f0f59e46edf1a2efe0391 X-Gerrit-Change-Number: 668 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 42540171e4bf07f487ec7c23cb2bd6cb62d2ba77 References: Message-ID: <6bd4026e966b54c38e0a5c2cc960caa65ffdb9e6-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.52 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.52 listed in bl.score.senderscore.com] 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.52 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1sJyAP-0005zF-5s Subject: [Openvpn-devel] [XS] Change in openvpn[master]: 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: , Reply-To: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1802307659236653891?= X-GMAIL-MSGID: =?utf-8?q?1802307659236653891?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/668?usp=email to review the following change. Change subject: t_server_null.sh: Fix failure case ...................................................................... t_server_null.sh: Fix failure case 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 --- M tests/t_server_null.sh M tests/t_server_null_client.sh 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/68/668/1 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