From patchwork Wed Mar 8 15:07:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 3110 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:2310:b0:9f:bfa4:120f with SMTP id r16csp557928dye; Wed, 8 Mar 2023 07:07:42 -0800 (PST) X-Google-Smtp-Source: AK7set9df/DGh0LT+aB810ulyKbvqmUJ9/vBG2JqygQI12Ggmhl8vJzaDf7ZGJY7FfhoJPGk2bGa X-Received: by 2002:a05:6a20:1b28:b0:cd:478b:a9c9 with SMTP id ch40-20020a056a201b2800b000cd478ba9c9mr16328820pzb.6.1678288062294; Wed, 08 Mar 2023 07:07:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678288062; cv=none; d=google.com; s=arc-20160816; b=CayN4Hf32PYbBsDAKdd2pC9fg+9nqntDtaSpsYpW6CJXQ2AFoHDoSNrlByv1cDjrfB lVVKy8/6tqFtLU2JUhrVDigl5jgrkNZEqkdSmH14fioIl/ApQeG94/QSWtG6dtPQH7UV 8jCsmNeOFveA7DNHQZ47fKeJL3jDgN4+aMVCHWDKRUknoK/ERESrFxXKy26GY8fcTykm 6MulLBc9Q3FKlqKpVzFSkWOUI5bPAdk5b9T+LPGFD0unnj6IIJ2xjxkyS1ZuB3eKudaY h/6aEE66DMVnG1hBLDMyviOb0YnD4ci3FDOAjSczIG0t2XxlGEbZkaK6NjB/fJXjZSAA BXdw== 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:message-id:date:to:from:dkim-signature:dkim-signature; bh=2IzFQsGoBQ3ibnb0KJQpGTcuwrFaZasGvJywQn+ppyM=; b=ppk1kIMFzE31+jvX8mdNdk/QbUgUKE+sbT9HsG5AXK/QkqhmljQCUsWEaBC6LuLm5k sFrg68uuPDEc9r6TdMXNz1eK9juNo+6NmG7N7GXkeBN6wxn/MiNsgPJX0yzRNA2yZJlu DjwcHwDxmPpYjSwFn+LYSz6pHLp+5UGydZ0ZVCArZXj/RMN8TkGCarhTd624KJodvEYa VcD3yKwPuMrj2gedNBUp7TpJGbn58ZiEfDGwm48aI/x+Ab8Mug0MKQSaF6+txF0cdL9G /iJN2puFmecnahf0En3rLNuM21ZZVSq0PWqX5J4U4jJI+AJuumRkI3mh97mCZV7MtJSx 0guA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=U77lCrIa; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UqgT0+PK; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id c133-20020a621c8b000000b00576c9c3c4aasi14537355pfc.5.2023.03.08.07.07.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2023 07:07:42 -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=U77lCrIa; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UqgT0+PK; 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 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 1pZvNw-0003Rj-EX; Wed, 08 Mar 2023 15:07:20 +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 1pZvNs-0003RS-UC for openvpn-devel@lists.sourceforge.net; Wed, 08 Mar 2023 15:07:17 +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:Message-Id: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: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=iQeH97PlbGIyL9Xj2mpoUCEEBQjEn3DTx2Okp5R7XUs=; b=U77lCrIaTMPuZVvB/+PsPoU4eI hQB/Qtn7o15Pb+/t2R+doDY4ZftfbwcLjl84krhIcL51VOX3yFmAjT5q1/5ZtzTBNKvzLPYfPDue5 1G9oI/F+0iblBOPB1cXT03sG/9HU5WMXHoGMmKPkDuauFeEMd7pjc7EtJ51c2cvV6a4o=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type: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=iQeH97PlbGIyL9Xj2mpoUCEEBQjEn3DTx2Okp5R7XUs=; b=U qgT0+PKbXvgD0DFwN7qvmSS2txxLCQZNh/2m21My/Bk7QbaBej/j9dwFAswm4j4aaLlEqGiCSmFtc fUHTyjuBFrHiBVYfirOujoIk60dum9Xg+wUZ2OdV2FZ7TrTgiop1eUJUvw0SX5AYPx+FTpsYF1RpO dTqqAqB5TAt/KRIA=; Received: from mout-p-201.mailbox.org ([80.241.56.171]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1pZvNp-000rUJ-F8 for openvpn-devel@lists.sourceforge.net; Wed, 08 Mar 2023 15:07:17 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4PWwdh6B41z9t4Q for ; Wed, 8 Mar 2023 16:07:04 +0100 (CET) From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Wed, 8 Mar 2023 16:07:04 +0100 Message-Id: <20230308150704.128797-1-frank@lichtenheld.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PWwdh6B41z9t4Q X-Spam-Score: -0.7 (/) 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: Commit 7f72abcf8a56bb35a510a3409e03a4e2aaba50da enabled subdir-objects when using automake 1.16+. There is an issue with the handling of .deps directories with this option. While automake 1.16 fixed subdir-objects to work at all when _SOURCES contains "unexpanded references" and it did fix subdir- [...] Content analysis details: (-0.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.56.171 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record X-Headers-End: 1pZvNp-000rUJ-F8 Subject: [Openvpn-devel] [PATCH] tests/unit_tests: Fix 'make distcheck' with subdir-objects enabled 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?1759812583083395217?= X-GMAIL-MSGID: =?utf-8?q?1759812583083395217?= Commit 7f72abcf8a56bb35a510a3409e03a4e2aaba50da enabled subdir-objects when using automake 1.16+. There is an issue with the handling of .deps directories with this option. While automake 1.16 fixed subdir-objects to work at all when _SOURCES contains "unexpanded references" and it did fix subdir-objects to work with out-of-tree build for "source files specified with an explicit '$(srcdir)'" those fixes are not transitive. "unexpanded references" still break out-of-tree builds when enforcing a read-only source dir like 'make distcheck' does. When using *explicit* references to srcdir and top_srcdir it works correctly. Signed-off-by: Frank Lichtenheld Acked-by: Selva Nair --- tests/unit_tests/openvpn/Makefile.am | 220 +++++++++--------- tests/unit_tests/plugins/auth-pam/Makefile.am | 6 +- 2 files changed, 110 insertions(+), 116 deletions(-) diff --git a/tests/unit_tests/openvpn/Makefile.am b/tests/unit_tests/openvpn/Makefile.am index ee0a3d8a..339c7ef3 100644 --- a/tests/unit_tests/openvpn/Makefile.am +++ b/tests/unit_tests/openvpn/Makefile.am @@ -30,189 +30,185 @@ if HAVE_SITNL check_PROGRAMS += networking_testdriver endif -openvpn_includedir = $(top_srcdir)/include -openvpn_srcdir = $(top_srcdir)/src/openvpn -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_CFLAGS = @TEST_CFLAGS@ -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/src/compat +argv_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn -Wl,--wrap=parse_line 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 + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/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_CFLAGS = @TEST_CFLAGS@ -I$(top_srcdir)/src/openvpn -I$(top_srcdir)/src/compat +buffer_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn -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 + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/platform.c crypto_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn crypto_testdriver_LDFLAGS = @TEST_LDFLAGS@ 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 \ - $(openvpn_srcdir)/crypto_openssl.c \ - $(openvpn_srcdir)/otime.c \ - $(openvpn_srcdir)/packet_id.c \ - $(openvpn_srcdir)/platform.c \ - $(openvpn_srcdir)/mtu.c \ - $(openvpn_srcdir)/win32-util.c \ - $(openvpn_srcdir)/mss.c + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/mtu.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/mss.c packet_id_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn packet_id_testdriver_LDFLAGS = @TEST_LDFLAGS@ 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 \ - $(openvpn_srcdir)/packet_id.c \ - $(openvpn_srcdir)/platform.c \ - $(openvpn_srcdir)/reliable.c \ - $(openvpn_srcdir)/win32-util.c \ - $(openvpn_srcdir)/session_id.c + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/reliable.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/session_id.c pkt_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn pkt_testdriver_LDFLAGS = @TEST_LDFLAGS@ pkt_testdriver_SOURCES = test_pkt.c mock_msg.c mock_msg.h \ - $(openvpn_srcdir)/argv.c \ - $(openvpn_srcdir)/base64.c \ - $(openvpn_srcdir)/buffer.c \ - $(openvpn_srcdir)/crypto.c \ - $(openvpn_srcdir)/crypto_mbedtls.c \ - $(openvpn_srcdir)/crypto_openssl.c \ - $(openvpn_srcdir)/env_set.c \ - $(openvpn_srcdir)/otime.c \ - $(openvpn_srcdir)/packet_id.c \ - $(openvpn_srcdir)/platform.c \ - $(openvpn_srcdir)/reliable.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 + $(top_srcdir)/src/openvpn/argv.c \ + $(top_srcdir)/src/openvpn/base64.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/env_set.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/reliable.c \ + $(top_srcdir)/src/openvpn/run_command.c \ + $(top_srcdir)/src/openvpn/session_id.c \ + $(top_srcdir)/src/openvpn/ssl_pkt.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/tls_crypt.c if !WIN32 tls_crypt_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn tls_crypt_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ -Wl,--wrap=buffer_read_from_file \ -Wl,--wrap=buffer_write_file \ -Wl,--wrap=parse_line \ -Wl,--wrap=rand_bytes 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 \ - $(openvpn_srcdir)/crypto.c \ - $(openvpn_srcdir)/crypto_mbedtls.c \ - $(openvpn_srcdir)/crypto_openssl.c \ - $(openvpn_srcdir)/env_set.c \ - $(openvpn_srcdir)/otime.c \ - $(openvpn_srcdir)/packet_id.c \ - $(openvpn_srcdir)/platform.c \ - $(openvpn_srcdir)/run_command.c + $(top_srcdir)/src/openvpn/argv.c \ + $(top_srcdir)/src/openvpn/base64.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/env_set.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/run_command.c endif if HAVE_SITNL networking_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ $(OPTIONAL_CRYPTO_CFLAGS) -networking_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(openvpn_srcdir) \ +networking_testdriver_LDFLAGS = @TEST_LDFLAGS@ -L$(top_srcdir)/src/openvpn \ $(OPTIONAL_CRYPTO_LIBS) networking_testdriver_SOURCES = test_networking.c mock_msg.c \ - $(openvpn_srcdir)/networking_sitnl.c \ - $(openvpn_srcdir)/buffer.c \ - $(openvpn_srcdir)/crypto.c \ - $(openvpn_srcdir)/crypto_mbedtls.c \ - $(openvpn_srcdir)/crypto_openssl.c \ - $(openvpn_srcdir)/otime.c \ - $(openvpn_srcdir)/packet_id.c \ - $(openvpn_srcdir)/platform.c + $(top_srcdir)/src/openvpn/networking_sitnl.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c endif provider_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ $(OPTIONAL_CRYPTO_CFLAGS) provider_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ $(OPTIONAL_CRYPTO_LIBS) provider_testdriver_SOURCES = test_provider.c mock_msg.c \ - $(openvpn_srcdir)/xkey_helper.c \ - $(openvpn_srcdir)/xkey_provider.c \ - $(openvpn_srcdir)/buffer.c \ - $(openvpn_srcdir)/base64.c \ + $(top_srcdir)/src/openvpn/xkey_helper.c \ + $(top_srcdir)/src/openvpn/xkey_provider.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/base64.c \ mock_get_random.c \ - $(openvpn_srcdir)/win32-util.c \ - $(openvpn_srcdir)/platform.c + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/platform.c if WIN32 cryptoapi_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ $(OPTIONAL_CRYPTO_CFLAGS) cryptoapi_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ $(OPTIONAL_CRYPTO_LIBS) -lcrypt32 -lncrypt cryptoapi_testdriver_SOURCES = test_cryptoapi.c mock_msg.c \ - $(openvpn_srcdir)/xkey_helper.c \ - $(openvpn_srcdir)/buffer.c \ - $(openvpn_srcdir)/base64.c \ - $(openvpn_srcdir)/platform.c \ + $(top_srcdir)/src/openvpn/xkey_helper.c \ + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/base64.c \ + $(top_srcdir)/src/openvpn/platform.c \ mock_get_random.c \ - $(openvpn_srcdir)/win32-util.c + $(top_srcdir)/src/openvpn/win32-util.c endif auth_token_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ $(OPTIONAL_CRYPTO_CFLAGS) auth_token_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ $(OPTIONAL_CRYPTO_LIBS) auth_token_testdriver_SOURCES = test_auth_token.c mock_msg.c \ - $(openvpn_srcdir)/buffer.c \ - $(openvpn_srcdir)/crypto.c \ - $(openvpn_srcdir)/crypto_mbedtls.c \ - $(openvpn_srcdir)/crypto_openssl.c \ - $(openvpn_srcdir)/otime.c \ - $(openvpn_srcdir)/packet_id.c \ - $(openvpn_srcdir)/platform.c \ - $(openvpn_srcdir)/win32-util.c \ - $(openvpn_srcdir)/base64.c + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/base64.c ncp_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) \ + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn \ $(OPTIONAL_CRYPTO_CFLAGS) ncp_testdriver_LDFLAGS = @TEST_LDFLAGS@ \ $(OPTIONAL_CRYPTO_LIBS) ncp_testdriver_SOURCES = test_ncp.c mock_msg.c \ - $(openvpn_srcdir)/buffer.c \ - $(openvpn_srcdir)/crypto.c \ - $(openvpn_srcdir)/crypto_mbedtls.c \ - $(openvpn_srcdir)/crypto_openssl.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 + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/crypto.c \ + $(top_srcdir)/src/openvpn/crypto_mbedtls.c \ + $(top_srcdir)/src/openvpn/crypto_openssl.c \ + $(top_srcdir)/src/openvpn/otime.c \ + $(top_srcdir)/src/openvpn/packet_id.c \ + $(top_srcdir)/src/openvpn/platform.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/compat/compat-strsep.c \ + $(top_srcdir)/src/openvpn/ssl_util.c misc_testdriver_CFLAGS = @TEST_CFLAGS@ \ - -I$(openvpn_includedir) -I$(compat_srcdir) -I$(openvpn_srcdir) + -I$(top_srcdir)/include -I$(top_srcdir)/src/compat -I$(top_srcdir)/src/openvpn misc_testdriver_LDFLAGS = @TEST_LDFLAGS@ misc_testdriver_SOURCES = test_misc.c mock_msg.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 + $(top_srcdir)/src/openvpn/buffer.c \ + $(top_srcdir)/src/openvpn/options_util.c \ + $(top_srcdir)/src/openvpn/ssl_util.c \ + $(top_srcdir)/src/openvpn/win32-util.c \ + $(top_srcdir)/src/openvpn/platform.c diff --git a/tests/unit_tests/plugins/auth-pam/Makefile.am b/tests/unit_tests/plugins/auth-pam/Makefile.am index 07233eee..de5e96e6 100644 --- a/tests/unit_tests/plugins/auth-pam/Makefile.am +++ b/tests/unit_tests/plugins/auth-pam/Makefile.am @@ -5,8 +5,6 @@ check_PROGRAMS = auth_pam_testdriver TESTS = $(check_PROGRAMS) endif -sut_sourcedir = $(top_srcdir)/src/plugins/auth-pam - -auth_pam_testdriver_SOURCES = test_search_and_replace.c $(sut_sourcedir)/utils.h $(sut_sourcedir)/utils.c -auth_pam_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(sut_sourcedir) +auth_pam_testdriver_SOURCES = test_search_and_replace.c $(top_srcdir)/src/plugins/auth-pam/utils.h $(top_srcdir)/src/plugins/auth-pam/utils.c +auth_pam_testdriver_CFLAGS = @TEST_CFLAGS@ -I$(top_srcdir)/src/plugins/auth-pam auth_pam_testdriver_LDFLAGS = @TEST_LDFLAGS@