From patchwork Mon Dec 11 15:53:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3517 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:8d12:b0:fc:24ac:f0cb with SMTP id i18csp5262851dys; Mon, 11 Dec 2023 07:55:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQN4fNKfWZdrf6WJqkWEA09STUkc81iu5R3AbOsX70j7EupChcPrnhS6RBstFMoBsfrHO+ X-Received: by 2002:a17:90a:6345:b0:286:4055:63e0 with SMTP id v5-20020a17090a634500b00286405563e0mr7965678pjs.0.1702310112584; Mon, 11 Dec 2023 07:55:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702310112; cv=none; d=google.com; s=arc-20160816; b=Pu9VbG7oMYdunzCHbmf8X1w8MRDbDWfccAu8mVsYF3K0kBzbOYGtULj3zfoIUrFFhD 0Z9EnHHkQHJD9XwULP5RMZTR4tBLr4GPPhSTEpeldB+EAALpsCZKXRX+xWnNUc57m9Pa elhlaArSrRji+e1FjEER+geSFVyy/5XQJRqYKftsMGJTJ2TV88MX3c4yJoy2Qx0IfWez 4VMb+fP43V2Ez6a73Nv/xisBoJzSnHZx5XdXyVscqK/jbEAAWxfvMRR0E4pLUcd8jDOP KTZYM+njZzJR7j8n3IDOO/k4wq8W3SrLeo8xa0o/hL5cz8ehxSs5MMFpjiK+BCkDMT5D ux2g== 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=xV6hympR07k5oKR3PIX2xITUTcwZF7HoKHpkiOWP6DE=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=FxODhw1geGjdHRunVK3nVq1lWfTN6zggYzIovme3JwOG9GBbbO5JGXzX47ON1csCtr PFXnhq7Wl4iJEiC1AQ2mTy1jWyooaKbFFwxe+scB0Af2w/lHzlBuCrqKMFSzT0fBaFDv 3s7SC3jWPkncxIjMcgxsMrAALBDs5+KEB01OyRHp0IS9eTaxjoEGznbrQK+pXzfbOOe7 LBfjT98YABykR6kXNcNC1ZNy+0DsHGygdEUkoQzEDcbpvehFR8z7SiYur/EYoBtcfXv3 ovMLKkpWYo2jTN6a88TiNvFQb+fm8gxZNXE3ywGXlCJaHJMWNbbiMB3SHrD5cn2JrMSx e7eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=gPuIUzjG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=L0FCgRgw; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=BsWRPFUk; 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 pi2-20020a17090b1e4200b00286a689f0e0si7761965pjb.1.2023.12.11.07.55.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2023 07:55:12 -0800 (PST) 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=gPuIUzjG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=L0FCgRgw; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=BsWRPFUk; 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rCibq-0006Ic-TV; Mon, 11 Dec 2023 15:54:19 +0000 Received: from [172.30.20.202] (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 1rCibn-0006IV-Ln for openvpn-devel@lists.sourceforge.net; Mon, 11 Dec 2023 15:54:16 +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=YUtBX8tbDroAaderoGQKYfTX7oDPxdUaLXx9t1f6t7E=; b=gPuIUzjGYt0kXy3eBylsGf8c4l kL99kgByXHiqt7mR6nF2c7XU92ZqN3D73BOZ00zN8QGw916hydbZbm9DhgkeaT2SnLNd8LkBwtfwg S4nY3TeVu8CXvRXtzcBLPjqFglvk0WZMOstFJzlKlXHo7VdcUvu/2q/Vujuizrx2Uwmg=; 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=YUtBX8tbDroAaderoGQKYfTX7oDPxdUaLXx9t1f6t7E=; b=L 0FCgRgw+ZvRBpAw2Umx117kKNqhQWFsaahhHiCuYxrxH4PSIElpCyh7wYzD8zBJZIynzyt0Bbd+gh iAupfhcRVoL4dufh2SSdEtj6M5lbv9Jnguf9fE3JKarrENXGXxXeo0RNIVrxtor4Znp4MecXv0X0S VrGgTXMeEvMEUFQE=; Received: from mail-wr1-f45.google.com ([209.85.221.45]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rCibj-0005Dv-TW for openvpn-devel@lists.sourceforge.net; Mon, 11 Dec 2023 15:54:13 +0000 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3334a701cbbso4806049f8f.0 for ; Mon, 11 Dec 2023 07:54:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1702310040; x=1702914840; 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=YUtBX8tbDroAaderoGQKYfTX7oDPxdUaLXx9t1f6t7E=; b=BsWRPFUk8Qs4r8W4xQ/jraN8PwEm2kVia47t8grOgahz387AVOPe7cxPSVoMVbLkt4 rekMeA4LKiagEQybbHEwmwNLw7nanr37SmCFTOsEzZ7XxKT+ZyTVbnxpeVq9VUKizkWG avX/WpX7AyfuSfs/KaiYsqUqvl2e+M4tjCltoOVtRQH1bZK64zt8ecwJ6hWTGccpQcd5 E5swpzdCYLd1sq6vQ/6XBD37C6a3vtBIrIz2sHQeIbs0Oq7QVYa7iRKflcQTAJQMXD9n +BTTLFi715273M5SJjzLBh20QZ4lUz6cMECmrHxVLNDROj8c8AglzFlPAo8ySdiMELJ+ ETpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702310040; x=1702914840; 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=YUtBX8tbDroAaderoGQKYfTX7oDPxdUaLXx9t1f6t7E=; b=HAZfEpYFOe6Da3r/C1+SLEGm2tQ+U7Jlpbks4kfmEORjdtW7dzhQbsc+uYfpT05FAY 9m1mcwv2cMLs/7Fiyx+ATt0CKr3MoGiz4P8u2bDZj4PEiN+0+gVtfMpWT0Oyj1kSYZUL 7mKAEBfbCvXvaATozCOYHeoAy3pMstHCPndrBzWBg7EsCy3itcsI6TomPbq9+ZSXxt4s PQlgf2huGu1ifNTfAU6yWJrxmyEIhpNC6CI3rVSzHhz24dFSvPC41o+BxtYH5oIJWY/A ZztBz6kxvInRdG/L4/jfm8ITI8GieCSR8MqLAGgArqCxckVTtpu9ZMQMy4pOn1oUwb7a 9DzA== X-Gm-Message-State: AOJu0YwKHFsxnCFT+JaLO0ujsD8bgVdI5qWNsCY9cK/miDWZlPrgS2jV WiP3tzDEtf0sAavwMJ922cOP3p45m/7jvSsmHgY= X-Received: by 2002:a7b:c4ca:0:b0:40c:2d71:9e26 with SMTP id g10-20020a7bc4ca000000b0040c2d719e26mr1720264wmk.140.1702310040337; Mon, 11 Dec 2023 07:54:00 -0800 (PST) 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 h12-20020a05600c314c00b0040c45cabc34sm5147451wmo.17.2023.12.11.07.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:53:59 -0800 (PST) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Mon, 11 Dec 2023 15:53:59 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: Ic7265d89142637b0963a6847c6beb06d9163bbb1 X-Gerrit-Change-Number: 477 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: ca1449dfcb653d632256f679a2471301c10ea1c1 References: Message-ID: <11f7b0f4e955d7f7ebf84db81aa4fa2926da7ab6-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-1.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 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.45 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.45 listed in wl.mailspike.net] 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_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.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 T_SCC_BODY_TEXT_LINE No description available. 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1rCibj-0005Dv-TW Subject: [Openvpn-devel] [S] Change in openvpn[master]: tests: disable automake serial_tests 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?1785001527794323814?= X-GMAIL-MSGID: =?utf-8?q?1785001527794323814?= 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/+/477?usp=email to review the following change. Change subject: tests: disable automake serial_tests ...................................................................... tests: disable automake serial_tests Serial mode is the old one and offers much less options for running the tests. Generally our tests seem to work fine with the newer parallel mode. The only reason we stuck with serial_tests seems to be that we didn't like that it doesn't output the test output by default. We could fix that with a custom test driver. But will put that into a separate commit. Change-Id: Ic7265d89142637b0963a6847c6beb06d9163bbb1 Signed-off-by: Frank Lichtenheld --- M configure.ac M tests/Makefile.am M tests/unit_tests/example_test/Makefile.am M tests/unit_tests/openvpn/Makefile.am M tests/unit_tests/plugins/auth-pam/Makefile.am 5 files changed, 9 insertions(+), 15 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/77/477/1 diff --git a/configure.ac b/configure.ac index 54f79ab..2823f04 100644 --- a/configure.ac +++ b/configure.ac @@ -41,20 +41,6 @@ AC_CONFIG_SRCDIR([src/openvpn/syshead.h]) AC_CONFIG_MACRO_DIR([m4]) -dnl Initialize automake. automake < 1.12 didn't have serial-tests and -dnl gives an error if it sees this, but for automake >= 1.13 -dnl serial-tests is required so we have to include it. Solution is to -dnl test for the version of automake (by running an external command) -dnl and provide it if necessary. Note we have to do this entirely using -dnl m4 macros since automake queries this macro by running -dnl 'autoconf --trace ...'. -m4_define([serial_tests], [ - m4_esyscmd([automake --version | - head -1 | - awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' - ]) -]) - dnl Automake 1.14+ warns if sources are in sub-directories but subdir-objects dnl options is not enabled. However, automake before 1.15a has a bug that causes dnl variable expansion to fail in foo_SOURCES when this option is used. @@ -69,7 +55,7 @@ # This foreign option prevents autoreconf from overriding our COPYING and # INSTALL targets: -AM_INIT_AUTOMAKE(foreign serial_tests subdir_objects 1.9) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(foreign subdir_objects 1.9) dnl NB: Do not [quote] this parameter. AC_CANONICAL_HOST AC_USE_SYSTEM_EXTENSIONS diff --git a/tests/Makefile.am b/tests/Makefile.am index 80673d5..6c71067 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,6 +14,8 @@ SUBDIRS = unit_tests +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) System Tests' + if !WIN32 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh if HAVE_SITNL diff --git a/tests/unit_tests/example_test/Makefile.am b/tests/unit_tests/example_test/Makefile.am index 24eb0ba..1ae80c8 100644 --- a/tests/unit_tests/example_test/Makefile.am +++ b/tests/unit_tests/example_test/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS = foreign +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) example Unit-Tests' + check_PROGRAMS = example_testdriver example2_testdriver if !CROSS_COMPILING diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am index ef45b11..cecf4dc 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS = foreign +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) Unit-Tests' + test_binaries= if HAVE_LD_WRAP_SUPPORT diff --git a/tests/unit_tests/plugins/auth-pam/Makefile.am b/tests/unit_tests/plugins/auth-pam/Makefile.am index de5e96e..ba32013 100644 --- a/tests/unit_tests/plugins/auth-pam/Makefile.am +++ b/tests/unit_tests/plugins/auth-pam/Makefile.am @@ -1,5 +1,7 @@ AUTOMAKE_OPTIONS = foreign +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING) auth_pam Plugin Unit-Tests' + if ENABLE_PLUGIN_AUTH_PAM check_PROGRAMS = auth_pam_testdriver TESTS = $(check_PROGRAMS)