From patchwork Wed Apr 17 10:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sommerseth X-Patchwork-Id: 726 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id eIK1MSeNt1yLBgAAIUCqbw for ; Wed, 17 Apr 2019 16:31:35 -0400 Received: from proxy13.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id eMqpMSeNt1yNfwAApN4f7A ; Wed, 17 Apr 2019 16:31:35 -0400 Received: from smtp28.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy13.mail.ord1d.rsapps.net with LMTP id qD1XMSeNt1xzGgAAgjf6aA ; Wed, 17 Apr 2019 16:31:35 -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: smtp28.gate.ord1d.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: cb27f3e6-614f-11e9-a86b-525400ea129b-1-1 Received: from [216.105.38.7] ([216.105.38.7:45016] helo=lists.sourceforge.net) by smtp28.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 99/AD-32568-72D87BC5; Wed, 17 Apr 2019 16:31:35 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1hGrCX-0000eG-US; Wed, 17 Apr 2019 20:30:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1hGrCW-0000e5-RH for openvpn-devel@lists.sourceforge.net; Wed, 17 Apr 2019 20:30:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=shARrCwHXiGokGjmQRPMCK3XKK3CwxfVTqbPHlJSJos=; b=HR0a/8jtufPH+Dwv7QDpQ7TgRc sKTCxgq0MQNSVdf3+G4vIcmW8wLRnui6WKCqoax0uYxEd+TlztWvzKqLfHuo8Jn24O4zqr0rOGq95 DE3es1VO513mUGnfRUIEt6mMZt4DmAFOTaRmGOCEL7/TgobCC21e9pZ0A9DYfcRtDAjE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=shARrCwHXiGokGjmQRPMCK3XKK3CwxfVTqbPHlJSJos=; b=XGDeNsL/iFmn2/qCduXqAoNmWM 8MVTI6L5qEtL1EgstyblF0aM1yjerBL1H7PtN28R8wCyoDCylT0JAFAJxojfIKOlRwXLTNmBqOCO5 ynxRzcLU5wAoY77BDbOKCtLElWOUctm2rlhb6m3j4FvqcPhTP+fsdGlJWIGUG4vjkj48=; Received: from mx0.basenordic.cloud ([185.212.44.139]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1hGrCU-00CB1W-I5 for openvpn-devel@lists.sourceforge.net; Wed, 17 Apr 2019 20:30:36 +0000 Received: from localhost (unknown [IPv6:::1]) by mx0.basenordic.cloud (Postfix) with ESMTP id DE1D98184EB for ; Wed, 17 Apr 2019 20:30:26 +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 L6z6E6ioPTiB for ; Wed, 17 Apr 2019 22:30:25 +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 4C85680C0CA for ; Wed, 17 Apr 2019 22:30:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.sommerseth.email (Postfix) with ESMTP id C047F45649B9 for ; Wed, 17 Apr 2019 22:30:24 +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 Pb8FG_X1b3Cc for ; Wed, 17 Apr 2019 22:30:24 +0200 (CEST) Received: from optimus.homebase.sommerseths.net (unknown [10.35.7.45]) by zimbra.sommerseth.email (Postfix) with ESMTPS id C0385401D343 for ; Wed, 17 Apr 2019 22:30:23 +0200 (CEST) From: David Sommerseth To: openvpn-devel@lists.sourceforge.net Date: Wed, 17 Apr 2019 22:30:15 +0200 Message-Id: <20190417203015.1903-1-davids@openvpn.net> X-Mailer: git-send-email 2.17.1 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: makefile.am] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 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: 1hGrCU-00CB1W-I5 Subject: [Openvpn-devel] [PATCH] 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. Signed-off-by: David Sommerseth ----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.5_git.tar.gz in a clean directory - cd openvpn-2.5_git/vendor - git clone https://git.cryptomilk.org/projects/cmocka.git - ./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: Steffan Karger --- tests/unit_tests/openvpn/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am index 4f137b2b..657957e5 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -19,7 +19,7 @@ compat_srcdir = $(top_srcdir)/src/compat argv_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(openvpn_srcdir) -I$(compat_srcdir) argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) -Wl,--wrap=parse_line -argv_testdriver_SOURCES = test_argv.c mock_msg.c \ +argv_testdriver_SOURCES = test_argv.c mock_msg.c mock_msg.h \ mock_get_random.c \ $(openvpn_srcdir)/platform.c \ $(openvpn_srcdir)/buffer.c \ @@ -27,14 +27,14 @@ argv_testdriver_SOURCES = test_argv.c mock_msg.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 \ mock_get_random.c \ $(openvpn_srcdir)/platform.c crypto_testdriver_CFLAGS = @TEST_CFLAGS@ \ -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@ -crypto_testdriver_SOURCES = test_crypto.c mock_msg.c \ +crypto_testdriver_SOURCES = test_crypto.c mock_msg.c mock_msg.h \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/crypto.c \ $(openvpn_srcdir)/crypto_mbedtls.c \ @@ -46,7 +46,7 @@ crypto_testdriver_SOURCES = test_crypto.c mock_msg.c \ packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \ -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@ -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 \ mock_get_random.c \ $(openvpn_srcdir)/buffer.c \ $(openvpn_srcdir)/otime.c \ @@ -60,7 +60,7 @@ tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ -Wl,--wrap=buffer_write_file \ -Wl,--wrap=parse_line \ -Wl,--wrap=rand_bytes -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)/argv.c \ $(openvpn_srcdir)/base64.c \ $(openvpn_srcdir)/buffer.c \