From patchwork Thu Oct 24 13:32:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3910 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:3a4c:b0:5b9:581e:f939 with SMTP id n12csp298115mao; Thu, 24 Oct 2024 06:33:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXz2TYh6jeLVH/OzRzOKNc3oLnV1PCLN1GuztBKNBZf3S54lT8ENfkCNsyOvSOZn/pPTNKbrYnR+ho=@openvpn.net X-Google-Smtp-Source: AGHT+IHFiUt+Z8lj7f5eQ+k9r2vNyV7PijanJqwL+sCNO/rCVsPzbqG2aDtiY1igvRhJjLgzPYYl X-Received: by 2002:a05:6808:648f:b0:3e6:2d10:2392 with SMTP id 5614622812f47-3e62d10244cmr1378222b6e.7.1729776781983; Thu, 24 Oct 2024 06:33:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729776781; cv=none; d=google.com; s=arc-20240605; b=fFQJ5qxzrDDAD5q0rSd0SyebY/aE3zFPVILspB6N+lCdoF0rCdKkzRn7hTH/E26GtN mzAEDvSWSMoJJDhc4TmMj6TrTBNqxh9suroAdy/3/sV4PqEbsMkwJErFpjadS64QTfnM sMCpDLNgqkkFpydYSB5SM7SejHn6MZ0rB2GT0SwxI4hp75ugKlaB2zMpgBQmaHOkEbTj Iluch0GN++TpbAhAPebOPw5eWGmSo8hcOBDCLs87EcJn2HQGjtbbNFJrKtwUInTqKG04 WHcBXyXYACAhpeYhwdTWc7CvLmz8W3UnEBojhAPGPkiXhwTysMKdo4yvRarVL3itPjjT qaWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=fTjadkhhWrosLL++PFW1AD1j0B4NgaPiYT9+695pCRc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=jTXA1Lqz3dKKd7hoZoVKWd6IEmrMTDEfHAy7oVTfe2ZNez2RVPVAmvrgh3awrqWGvS xfbVjDmQttUYT7E7cRIaiquNbAl5G7VYDjEqjuBOuFfI3wIrHDNxhWTz70/j5nhK5Y/t puvymG8KP5efLB2Dh6zgQPoFUA8+9bUvc9YRi0SimqFO3z2nQ7cT5WHNZr7krYi36B/W e5Req19xXZgIKGbDT/TTZinCD/JZykCeP8DR0xN1BWRB5MThSpvkz68KXYcNGtdVO+oY Vri+IX0wD1mB7/9joHZUwQSKZETlHY8BgkVFD1yylHwqcNo3BVyeWn+KiVC5wvZ5B0sq iVgQ==; 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=WE4pqs8P; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZItMtioK; 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 5614622812f47-3e610293d26si5576223b6e.8.2024.10.24.06.33.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2024 06:33:01 -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=WE4pqs8P; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZItMtioK; 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1t3xxK-0000QP-7A; Thu, 24 Oct 2024 13:32:50 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1t3xx3-0000Pr-L3 for openvpn-devel@lists.sourceforge.net; Thu, 24 Oct 2024 13:32:34 +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=6UHM6oUCYnGFrAi3FOEy6GGFVSKKxI2oCDTR8FP0QmY=; b=WE4pqs8PpeFbCpekxfeR/lACSv fLhR8CvuuyqtRzB/Brq+lF5rjwOtVgJZyMN/ZL6kriDA2arsLpiiUbSL6gSoDA1oESU/kmhHBDE/l +Btl/YBPAGiPJoaSLAamZGtohrwkXQ5p1xLvGlV21gx+W/z942WHX2ItmZ1/iu+mIKpM=; 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=6UHM6oUCYnGFrAi3FOEy6GGFVSKKxI2oCDTR8FP0QmY=; b=ZItMtioKGEN8FhFsoRhelIpsRv G0djfj2T/iIfNemqCDCbq3IK1OZ8sPQmPxlh41t2cs6tjvPYZ2yJRJemAADKLUOJlZOf5MvGUTcKT 7G/z5xMmtl9qEky42Sy4kZNO2XriuYPzG4w8o74O0Ukfs0Pb0mNN0nQFkPPUzNrpMZIA=; 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 1t3xx2-0004OZ-Dw for openvpn-devel@lists.sourceforge.net; Thu, 24 Oct 2024 13:32:34 +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 49ODWPlx004966 for ; Thu, 24 Oct 2024 15:32:25 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 49ODWPi8004965 for openvpn-devel@lists.sourceforge.net; Thu, 24 Oct 2024 15:32:25 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 24 Oct 2024 15:32:17 +0200 Message-ID: <20241024133220.4864-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 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-2=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_Samuli_Sepp=C3=A4nen_=3Csamuli?= =?unknown-8bit?q?=2Eseppanen=40gmail=2Ecom=3E_The_goal?= =?unknown-8bit?q?_is_to_help_debug_issues_with_t=5Fserver=5Fnull=2E_The_imme?= =?unknown-8bit?q?diate_goal_is_to_be_able?= =?unknown-8bit?q?_to_debug_server_startup_issues_encountered_on_some_of_the_?= =?unknown-8bit?q?*BSD_platforms=2E?= =?unknown-8bit?q?_?= =?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_SPF=5FHELO=5FPASS__________SPF=3A_HELO_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= X-Headers-End: 1t3xx2-0004OZ-Dw Subject: [Openvpn-devel] [PATCH v2] t_server_null: persist test log files 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?1813802419294194955?= X-GMAIL-MSGID: =?utf-8?q?1813802419294194955?= From: Samuli Seppänen The goal is to help debug issues with t_server_null. The immediate goal is to be able to debug server startup issues encountered on some of the *BSD platforms. Change-Id: I49f1e7d25edb62bf202ffceb45dedc213f2eafdd Signed-off-by: Samuli Seppänen Acked-by: Gert Doering --- 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/+/776 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/tests/t_server_null.sh b/tests/t_server_null.sh index 7627edf..61a9cdc 100755 --- a/tests/t_server_null.sh +++ b/tests/t_server_null.sh @@ -56,11 +56,16 @@ fi srcdir="${srcdir:-.}" +export t_server_null_logdir=t_server_null-`hostname`-`date +%Y%m%d-%H%M%S` + +# Create directory for server and client logs +mkdir $t_server_null_logdir "${srcdir}/t_server_null_server.sh" & "${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 diff --git a/tests/t_server_null_client.sh b/tests/t_server_null_client.sh index c1a25df..846f790 100755 --- a/tests/t_server_null_client.sh +++ b/tests/t_server_null_client.sh @@ -14,7 +14,7 @@ $client_conf \ --writepid "${pid}" \ --setenv pid $pid \ - --log "${log}" & + --log "${t_server_null_logdir}/${log}" & } wait_for_results() { @@ -44,7 +44,7 @@ should_pass=$2 log="${test_name}.log" - grep "Initialization Sequence Completed" "${log}" > /dev/null + grep "Initialization Sequence Completed" "${t_server_null_logdir}/${log}" > /dev/null exit_code=$? if [ $exit_code -eq 0 ] && [ "${should_pass}" = "yes" ]; then diff --git a/tests/t_server_null_server.sh b/tests/t_server_null_server.sh index 10bb44b..f8ba3a3 100755 --- a/tests/t_server_null_server.sh +++ b/tests/t_server_null_server.sh @@ -4,12 +4,11 @@ server_name=$1 server_exec=$2 server_conf=$3 - log="${server_name}.log" + log="${t_server_null_logdir}/${server_name}.log" status="${server_name}.status" pid="${server_name}.pid" if [ -z "${RUN_SUDO}" ]; then - rm -f "${status}" "${log}" "${pid}" "${server_exec}" \ $server_conf \ --status "${status}" 1 \ @@ -17,7 +16,6 @@ --writepid "${pid}" \ --explicit-exit-notify 3 else - $RUN_SUDO rm -f "${status}" "${log}" "${pid}" $RUN_SUDO "${server_exec}" \ $server_conf \ --status "${status}" 1 \