From patchwork Sat Feb 4 00:45:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 3048 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:c95:b0:82:e4b3:40a0 with SMTP id p21csp1545504dyk; Fri, 3 Feb 2023 16:45:46 -0800 (PST) X-Google-Smtp-Source: AK7set9HyXtgA1+tGsxeNnUuBbOgWUlFBH9zery944fDlo0OrrsPnMTp670f3jKCccInB1rxLl4g X-Received: by 2002:a05:6a20:1455:b0:be:d4d:81bb with SMTP id a21-20020a056a20145500b000be0d4d81bbmr7226416pzi.53.1675471546487; Fri, 03 Feb 2023 16:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675471546; cv=none; d=google.com; s=arc-20160816; b=crhYZu0oKAyTvx3CEOjsMI0qDwe2iY35kaIDwkeR4enFsnBRYsh1MSL4zeHoXl99Sh CPmn1hABB8yn5yCGe3RKoF1TKsBAsqJE9K8nEWKbiA2IFWFmh+yzzODvcr/l3p9mlo48 wcbDJVbUJ1hn1gvEbSLBZIROjahbkVGeJ1l7OCMWXXmwMT40uSZPBV3voUeIBctdVovq mikKT6L+HllEN4JXMAkazBsnQOodvaJ9dHmE9ddxpLk4oY1Vz9Wpq96TJWSVpBoGGesS +KOCbGL7hrW3O6YgKE7CqeYRgCGRI4JBgaBTLJpKn00L/eNUK6MzhhXMCcYk0E2kCqH8 5v8Q== 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:dkim-signature; bh=gN8YYEBrDR/O3SAKOKi7/OdmZvYKD9M7NFs7aUyKIcw=; b=yonjgXTogdDKan3NE3Bn9qn8yUJZ9WaSpgp7qf8s/C5mAhN0kicdtRUbVepuCn2jyz pieHgwDJLhDkLOWg2Yqd13xnJq6KWZEp+EHab3zT4WKWEUX9PzLsWZjGi0UPQqJuJWw9 EmmB2bgwHUI4HxgfVfeV+58eT3Yw9GKUGD2P/xaacTDVZI/1OsEpodKEW42d43EXxUv2 F23qIlqZkKPVSPboGwaphIopuaFq+nxPQQC/Y4Zz0l3S1Y0cvZUL1F/utXdpYUHmuOXJ lz7CHm++m8Hmbxnb4g2b9slepgMCEokUfUaIxqMgprggfhoWaBkXcG0ECYkFawrp65xt eyZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=cMN50o5A; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=dCe100AL; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=i78Ctkhn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id m3-20020a637103000000b004ce0ead7aabsi4025183pgc.302.2023.02.03.16.45.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2023 16:45:46 -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=cMN50o5A; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=dCe100AL; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=i78Ctkhn; 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=QUARANTINE dis=NONE) header.from=gmail.com 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 1pO6gN-0002f0-8I; Sat, 04 Feb 2023 00:45:29 +0000 Received: from [172.30.20.202] (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 1pO6gM-0002eq-5a for openvpn-devel@lists.sourceforge.net; Sat, 04 Feb 2023 00:45:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: 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=AJvCsOdnVXflbecGylNzPMWaoiNedQL+E/INegcKl+I=; b=cMN50o5AkhfeFvM2FtBfIjtRR9 xysQnliBY0wo1ERZtb07okj+km21bGx74vRqcaGku7DFoWzcDYMj/D7E7JeSiS2xLbzmKuu8QtDzh gRtu0IlXeWTtWR7NVBi0r1UT9SmkRTLYbieNlVHkPEV46p94xM8xxQI3O2a0xFd4zT70=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=AJvCsOdnVXflbecGylNzPMWaoiNedQL+E/INegcKl+I=; b=dCe100ALKVarxfFhzrxICmODO+ JLrCR2xpMStam2ks7ZVG8KBgPtq6d8PJzYpfVkNq9XBj7EZ3UA0b3UJlBhjQghG3vabXzlNMLORew AeXD5qNS9t4dWGGT1XRG8ru7r4mAElZ/YPDMMpBRHwZAXl+u/MPimOQ2wBh7PN/wzTvU=; Received: from mail-il1-f171.google.com ([209.85.166.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1pO6gG-0008Qd-KP for openvpn-devel@lists.sourceforge.net; Sat, 04 Feb 2023 00:45:28 +0000 Received: by mail-il1-f171.google.com with SMTP id u7so2778229ilg.4 for ; Fri, 03 Feb 2023 16:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AJvCsOdnVXflbecGylNzPMWaoiNedQL+E/INegcKl+I=; b=i78CtkhnhXcMFk//5v2hfyX96gYV9Ps0Rlqiwr3/8xD6f/1niAP18X30yusvchAbFS tqO4xjdPuOjTi0wdlIMLF/9rmx722Qi8Q/6pdRIOM5U74DjMIqrKz1bi9nmHcVD9Hg2p pdDYKm2DBMHUfOySbD35doxsSukLkgjh214DHydZWKaIWn8XQSY1KqxfdF5Z9RLegiXG FICcTU0d0OpQI1auyskxwZ9vbiNzWghqvc7KoeveX1M08TVValxh55P7ZA8LgDludBfd hjSbKl4vrl+JYRRfjeiYvjlkBPRZyWWhPllV0jo3SJKaoVFtSN5G+smuiylXlenV/9/g Y2gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AJvCsOdnVXflbecGylNzPMWaoiNedQL+E/INegcKl+I=; b=IQsDz2ukcumuLk6oeq4d9CiWSvKmEMn9gyk1c+nVHwSfs0g9sfBgPfWnrN3dsOAsKN AXB0U34veukFgEyBlj596Um2am4z47uv6Fv+T8hmbWEH+d2TYYUvxfWlGBnT++fu1Jr0 6FWNEhEmTkQSh201GRDy4HS01XW8xtyy0Hc2iA2aQ9y5HzEAwxmojNE5BtMLLHWn1rrE jXc2/a/U6N++n1wCliZNQ8HgD5oYCbpfePjoNH81hvSrijs1Wdc06ZXmXrPP002CmIZZ nHz8EI6XZFq5sDHgmGwmpG1VbqvQK/b/SPjn3Gg7iNebmq1zhsHPQX2/Cn/OLkQqMFeO LXrA== X-Gm-Message-State: AO0yUKU0YAt6ukpfn1z+xeWHAoS4M7fDjzh65V5d0tDce4bnGZCR6MM3 I2XG+/WHTg0P5Ngt6XX/v1//HhLGcM4= X-Received: by 2002:a92:d285:0:b0:313:b17e:aa4f with SMTP id p5-20020a92d285000000b00313b17eaa4fmr195546ilp.0.1675471519558; Fri, 03 Feb 2023 16:45:19 -0800 (PST) Received: from uranus.sansel.ca (bras-vprn-tnhlon4053w-lp130-01-70-51-222-66.dsl.bell.ca. [70.51.222.66]) by smtp.gmail.com with ESMTPSA id l3-20020a056e021c0300b0031109a23893sm1222745ilh.23.2023.02.03.16.45.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 16:45:19 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Fri, 3 Feb 2023 19:45:11 -0500 Message-Id: <20230204004512.250271-2-selva.nair@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230204004512.250271-1-selva.nair@gmail.com> References: <20230204004512.250271-1-selva.nair@gmail.com> MIME-Version: 1.0 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: From: Selva Nair - Minor changes to the build system to include some dependencies for Windows build - test_tls_crypt not built as it will pull in win32.c and its dependencies 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.166.171 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [selva.nair[at]gmail.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.171 listed in wl.mailspike.net] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1pO6gG-0008Qd-KP Subject: [Openvpn-devel] [PATCH 2/3] Build unit tests in mingw Windows build 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?1756859252319732427?= X-GMAIL-MSGID: =?utf-8?q?1756859252319732427?= From: Selva Nair - Minor changes to the build system to include some dependencies for Windows build - test_tls_crypt not built as it will pull in win32.c and its dependencies - If cross-compiling, "make check" will only build the tests but not run any. Copy to Windows and run manually. Executables are in /tests/unit_tests/openvpn/.libs/ and these depend on cmocka.dll in addition to openssl libs that some tests link to. Building with mingw on Windows should run the tests (untested). Signed-off-by: Selva Nair --- configure.ac | 2 ++ tests/Makefile.am | 2 ++ tests/unit_tests/example_test/Makefile.am | 2 ++ tests/unit_tests/openvpn/Makefile.am | 35 +++++++++++++++++------ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 95d795c3..66ba6f38 100644 --- a/configure.ac +++ b/configure.ac @@ -364,6 +364,8 @@ case "$host" in ;; esac +AM_CONDITIONAL([CROSS_COMPILING], test "${cross_compiling}" = "yes") + PKG_PROG_PKG_CONFIG AC_PROG_CPP AC_PROG_INSTALL diff --git a/tests/Makefile.am b/tests/Makefile.am index 87dd7e17..a46f2573 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,10 +14,12 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests +if !WIN32 test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh if HAVE_SITNL test_scripts += t_net.sh endif +endif TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts) diff --git a/tests/unit_tests/example_test/Makefile.am b/tests/unit_tests/example_test/Makefile.am index 04a5ad35..24eb0ba1 100644 --- a/tests/unit_tests/example_test/Makefile.am +++ b/tests/unit_tests/example_test/Makefile.am @@ -2,7 +2,9 @@ AUTOMAKE_OPTIONS = foreign check_PROGRAMS = example_testdriver example2_testdriver +if !CROSS_COMPILING TESTS = $(check_PROGRAMS) +endif example_testdriver_CFLAGS = @TEST_CFLAGS@ example_testdriver_LDFLAGS = @TEST_LDFLAGS@ diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am index 7720a85d..909ac4e2 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -7,20 +7,29 @@ test_binaries += argv_testdriver buffer_testdriver endif test_binaries += crypto_testdriver packet_id_testdriver auth_token_testdriver ncp_testdriver misc_testdriver \ - pkt_testdriver +pkt_testdriver if HAVE_LD_WRAP_SUPPORT +if !WIN32 test_binaries += tls_crypt_testdriver endif +endif test_binaries += provider_testdriver -TESTS = $(test_binaries) -check_PROGRAMS = $(test_binaries) +if WIN32 +test_binaries += cryptoapi_testdriver +LDADD = -lws2_32 +endif if HAVE_SITNL -check_PROGRAMS += networking_testdriver +test_binaries += networking_testdriver endif +if !CROSS_COMPILING +TESTS = $(test_binaries) +endif +check_PROGRAMS = $(test_binaries) + openvpn_includedir = $(top_srcdir)/include openvpn_srcdir = $(top_srcdir)/src/openvpn compat_srcdir = $(top_srcdir)/src/compat @@ -31,12 +40,14 @@ argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \ mock_get_random.c \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/buffer.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/argv.c buffer_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) buffer_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line buffer_testdriver_SOURCES = test_buffer.c mock_msg.c mock_msg.h \ mock_get_random.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/platform.c crypto_testdriver_CFLAGS = @TEST_CFLAGS@ \ @@ -51,6 +62,7 @@ crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/packet_id.c \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/mtu.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/mss.c packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \ @@ -63,14 +75,14 @@ packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/packet_id.c \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/reliable.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/session_id.c - pkt_testdriver_CFLAGS = @TEST_CFLAGS@ \ -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) pkt_testdriver_LDFLAGS = @TEST_LDFLAGS@ pkt_testdriver_SOURCES = test_pkt.c mock_msg.c mock_msg.h \ -$(openvpn_srcdir)/argv.c \ + $(openvpn_srcdir)/argv.c \ $(openvpn_srcdir)/base64.c \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/crypto.c \ @@ -84,9 +96,10 @@ $(openvpn_srcdir)/argv.c \ $(openvpn_srcdir)/run_command.c \ $(openvpn_srcdir)/session_id.c \ $(openvpn_srcdir)/ssl_pkt.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/tls_crypt.c - +if !WIN32 tls_crypt_testdriver_CFLAGS = @TEST_CFLAGS@ \ -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ @@ -106,6 +119,7 @@ tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/packet_id.c \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/run_command.c +endif if HAVE_SITNL networking_testdriver_CFLAGS = @TEST_CFLAGS@ \ @@ -136,6 +150,7 @@ provider_testdriver_SOURCES = test_provider.c mock_msg.c \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/base64.c \ mock_get_random.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/platform.c auth_token_testdriver_CFLAGS = @TEST_CFLAGS@ \ @@ -152,6 +167,7 @@ auth_token_testdriver_SOURCES = test_auth_token.c mock_msg.c \ $(openvpn_srcdir)/otime.c \ $(openvpn_srcdir)/packet_id.c \ $(openvpn_srcdir)/platform.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/base64.c @@ -169,6 +185,8 @@ ncp_testdriver_SOURCES = test_ncp.c mock_msg.c \ $(openvpn_srcdir)/otime.c \ $(openvpn_srcdir)/packet_id.c \ $(openvpn_srcdir)/platform.c \ + $(openvpn_srcdir)/win32-util.c \ + $(compat_srcdir)/compat-strsep.c \ $(openvpn_srcdir)/ssl_util.c misc_testdriver_CFLAGS = @TEST_CFLAGS@ \ @@ -177,8 +195,9 @@ misc_testdriver_CFLAGS = @TEST_CFLAGS@ \ misc_testdriver_LDFLAGS = @TEST_LDFLAGS@ misc_testdriver_SOURCES = test_misc.c mock_msg.c \ - mock_get_random.c \ + mock_get_random.c \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/options_util.c \ $(openvpn_srcdir)/ssl_util.c \ + $(openvpn_srcdir)/win32-util.c \ $(openvpn_srcdir)/platform.c