From owner-svn-ports-head@freebsd.org Sat Aug 27 12:23:59 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 685D5A946FC; Sat, 27 Aug 2016 12:23:59 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 21248266; Sat, 27 Aug 2016 12:23:59 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7RCNwjT039323; Sat, 27 Aug 2016 12:23:58 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7RCNwo8039321; Sat, 27 Aug 2016 12:23:58 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201608271223.u7RCNwo8039321@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 27 Aug 2016 12:23:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420973 - in head/security/openvpn: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Aug 2016 12:23:59 -0000 Author: mandree Date: Sat Aug 27 12:23:58 2016 New Revision: 420973 URL: https://svnweb.freebsd.org/changeset/ports/420973 Log: Fix self-tests in poudriere, make them more robust [1]. The self-tests used to fail in poudriere with dependency cycles in Makefile that weren't visible earlier. Conditionally change ALL_TARGET to check (do not use all check, that would require gmake) if the TEST option is set (default), or set TEST_TARGET if the TEST option is unset. While I am unable to reproduce 212146 claiming the self-tests fail on an IPv6-disabled host, and I believe it's a red herring masking a local configuration issue, doubt sed(1) and add blanks, and be sure to add the "proto" earlier. The reporter didn't mention his OS version. No PORTREVISION bump since the default build is unaffected. PR: 212146 [1] Modified: head/security/openvpn/Makefile head/security/openvpn/files/patch-tests__t_cltsrv.sh Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Sat Aug 27 12:20:17 2016 (r420972) +++ head/security/openvpn/Makefile Sat Aug 27 12:23:58 2016 (r420973) @@ -79,7 +79,8 @@ LIB_DEPENDS+= liblzo2.so:archivers/lzo2 PORTDOCS= * PORTEXAMPLES= * -TEST_TARGET= check +TEST_ALL_TARGET= check +TEST_TEST_TARGET_OFF= check # XXX Please remove this compatibility wrapper after 2017Q2 is branched. .ifdef(WITHOUT_CHECK) @@ -104,8 +105,6 @@ post-configure: ${WRKSRC}/src/plugins/auth-pam/Makefile \ ${WRKSRC}/src/plugins/down-root/Makefile -post-build-TEST-on: test - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so Modified: head/security/openvpn/files/patch-tests__t_cltsrv.sh ============================================================================== --- head/security/openvpn/files/patch-tests__t_cltsrv.sh Sat Aug 27 12:20:17 2016 (r420972) +++ head/security/openvpn/files/patch-tests__t_cltsrv.sh Sat Aug 27 12:23:58 2016 (r420973) @@ -37,10 +37,10 @@ + exit 77 +fi +if [ "inet6" = "$1" ] ; then -+ add='proto udp6' ++ add='proto udp6 ' +fi +for i in server client ; do -+ sed -e "s/localhost/$2/" -e "/^remote/a\\ ++ sed -e "s/localhost/$2/" -e "/^remote /a\\ +$add" ${root}/sample-config-files/loopback-$i \ + >${root}/sample-config-files/loopback-$i.test +done