From patchwork Tue May 7 10:04:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 727 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director11.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id 0I2nGCTl0VwHQwAAIUCqbw for ; Tue, 07 May 2019 16:05:56 -0400 Received: from proxy6.mail.ord1c.rsapps.net ([172.28.255.1]) by director11.mail.ord1d.rsapps.net with LMTP id GMScGCTl0VyIIAAAvGGmqA ; Tue, 07 May 2019 16:05:56 -0400 Received: from smtp38.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.ord1c.rsapps.net with LMTP id KJruFyTl0VyPCAAA9sKXow ; Tue, 07 May 2019 16:05:56 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp38.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=openvpn.net X-Suspicious-Flag: YES X-Classification-ID: 85aee6a8-7103-11e9-bcfd-5452007bdf16-1-1 Received: from [216.105.38.7] ([216.105.38.7:22487] helo=lists.sourceforge.net) by smtp38.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4D/C1-04007-325E1DC5; Tue, 07 May 2019 16:05:56 -0400 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.90_1) (envelope-from ) id 1hO6Kf-0003l7-W5; Tue, 07 May 2019 20:04:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hO6Ke-0003kw-Eq for openvpn-devel@lists.sourceforge.net; Tue, 07 May 2019 20:04:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=Dc1MEbC6kiYFTA/PzkXk0PPDXbOXN9LyxbHVqvoqJfo=; b=Q8NJQ0DaNeMaf59/+jW898LuQa XnOXpp4jQ1xreklUXNl7wvj+1p3bot7wk8+XahULh0kKRc0t93ERgKkr9Ob8vs4zpj/LC1WuFosWx uUhC1padqib8Q7jg5FVePQCH/MUfzajHBvJ7bfsvzasKWeFAakbt+zjxE3DRiyQSiGy4=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding: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=Dc1MEbC6kiYFTA/PzkXk0PPDXbOXN9LyxbHVqvoqJfo=; b=LzZJ+A1PxzVoYPV2rUZ/YvS0gp XrHVqxNq40Il1DKqcqZPOCmQ83ghX0USl+wAtPOZobia+Cn2giQAcT2KqmiMXZLKGqckKqYWmakq8 QOubLNf6IREn4XiRhE8lO9MXoabGg82l0l7N6XR3jRx0awjZuhheeDoSK/nWglnUazvk=; Received: from mx0.basenordic.cloud ([185.212.44.139]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hO6Ka-0096zu-OR for openvpn-devel@lists.sourceforge.net; Tue, 07 May 2019 20:04:56 +0000 Received: from localhost (unknown [IPv6:::1]) by mx0.basenordic.cloud (Postfix) with ESMTP id 47CA88288A4 for ; Tue, 7 May 2019 20:04:45 +0000 (UTC) Received: from mx0.basenordic.cloud ([127.0.0.1]) by localhost (winterfell.topphemmelig.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IJfWS8SOikA6 for ; Tue, 7 May 2019 22:04:43 +0200 (CEST) Received: from zimbra.sommerseth.email (zimbra.sommerseth.email [172.16.33.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx0.basenordic.cloud (Postfix) with ESMTPS id D22F78225A1 for ; Tue, 7 May 2019 22:04:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.sommerseth.email (Postfix) with ESMTP id 5D2024071750 for ; Tue, 7 May 2019 22:04:42 +0200 (CEST) Received: from zimbra.sommerseth.email ([127.0.0.1]) by localhost (zimbra.sommerseth.email [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ejm4Z3UyBo-J for ; Tue, 7 May 2019 22:04:42 +0200 (CEST) Received: from optimus.homebase.sommerseths.net (unknown [10.35.7.45]) by zimbra.sommerseth.email (Postfix) with ESMTPS id 2C06B407174F for ; Tue, 7 May 2019 22:04:42 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Tue, 7 May 2019 22:04:34 +0200 Message-Id: <20190507200434.24931-1-davids@openvpn.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190417203015.1903-1-davids@openvpn.net> References: <20190417203015.1903-1-davids@openvpn.net> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 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: foxcrypto.com] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1hO6Ka-0096zu-OR Subject: [Openvpn-devel] [PATCH v2.4] build: Package missing mock_msg.h 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: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox The mock_msg.h file was not enlisted in the _SOURCES lists in Makefile.am for the unit tests. This caused the mock_msg.h file to not be present in the .tar.gz file created by 'make dist'. This was not noticed earlier as we haven't really tried much to run git clone of the cmocka project manually in vendor/ from an unpacked tarball. With this fix the cmocka unit tests can also run from tarballs, with manually extracting/fetching the cmocka source code in vendor/cmocka. This patch is a backport of git master commit 19a22ac5a8673e8715. Signed-off-by: David Sommerseth Cc: Steffan Karger ----8<----8<----8<----8<----8<----8<----8<----8<----8<----8<----8<---- How to test: - Create a tarball: make distcheck (or just 'dist') - Extract openvpn-2.4.*.tar.gz in a clean directory - cd openvpn-2.4.*/vendor - git clone https://git.cryptomilk.org/projects/cmocka.git - cd .. - ./configure - make check - Observe that the cmocka unit tests ran as expected Depending on the CMake version, you might want to check out cmocka git commit b2732b52202ae48f; which is the one we use in the git submodule. Acked-by: Gert Doering --- tests/unit_tests/openvpn/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am index 7b44f42e..55e29e40 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -20,14 +20,14 @@ argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) \ $(OPTIONAL_CRYPTO_CFLAGS) argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line \ $(OPTIONAL_CRYPTO_LIBS) -argv_testdriver_SOURCES = test_argv.c mock_msg.c \ +argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/buffer.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 \ +buffer_testdriver_SOURCES = test_buffer.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/platform.c @@ -36,7 +36,7 @@ packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \ $(OPTIONAL_CRYPTO_CFLAGS) packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ $(OPTIONAL_CRYPTO_LIBS) -packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c \ +packet_id_testdriver_SOURCES = test_packet_id.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/otime.c \ $(openvpn_srcdir)/packet_id.c \ @@ -47,7 +47,7 @@ tls_crypt_testdriver_CFLAGS = @TEST_CFLAGS@ \ $(OPTIONAL_CRYPTO_CFLAGS) tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ $(OPTIONAL_CRYPTO_LIBS) -tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c \ +tls_crypt_testdriver_SOURCES = test_tls_crypt.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/crypto.c \ $(openvpn_srcdir)/crypto_mbedtls.c \