Date: Sat, 27 Aug 2016 12:23:58 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420973 - in head/security/openvpn: . files Message-ID: <201608271223.u7RCNwo8039321@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608271223.u7RCNwo8039321>