When testing, build test-depends too, and install the depends as root.

Author: mat813

src/share/poudriere/common.sh

@@ -2198,7 +2198,7 @@ _real_build_port() {
 		# Don't need to install if only making packages and not
 		# testing.
 		[ -n "${PORTTESTING}" ] && \
-		    install_order="${install_order} test install-mtree install"
+		    install_order="${install_order} test-depends test install-mtree install"
 	fi
 	targets="check-sanity pkg-depends fetch-depends fetch checksum \
 		  extract-depends extract patch-depends patch build-depends \
@@ -3252,10 +3252,13 @@ prefix_output() {
 }
 
 list_deps() {
-	[ $# -ne 1 ] && eargs list_deps directory
+	[ $# -ne 1 -a $# -ne 2 ] && eargs list_deps directory '[testing]'
 	local dir="/usr/ports/$1"
 	local makeargs="-VPKG_DEPENDS -VBUILD_DEPENDS -VEXTRACT_DEPENDS -VLIB_DEPENDS -VPATCH_DEPENDS -VFETCH_DEPENDS -VRUN_DEPENDS"
 
+	[ -n "$2" ] && \
+		makeargs="${makeargs} -VTEST_DEPENDS"
+
 	prefix_stderr_quick "(${COLOR_PORT}$1${COLOR_RESET})${COLOR_WARN}" \
 		injail /usr/bin/make -C ${dir} $makeargs | tr ' ' '\n' | \
 		awk -F: '{ gsub(/\/usr\/ports\//,"", $2); print $2 }' | \
@@ -3890,7 +3893,7 @@ compute_deps_port() {
 
 	msg_verbose "Computing deps for ${COLOR_PORT}${port}"
 
-	for dep_port in `list_deps ${port}`; do
+	for dep_port in `list_deps ${port} ${PORTTESTING}`; do
 		msg_debug "${COLOR_PORT}${port}${COLOR_DEBUG} depends on ${COLOR_PORT}${dep_port}"
 		if [ "${port}" = "${dep_port}" ]; then
 			msg_error "${COLOR_PORT}${port}${COLOR_RESET} incorrectly depends on itself. Please contact maintainer of the port to fix this."

src/share/poudriere/testport.sh

@@ -172,7 +172,7 @@ if [ $CONFIGSTR -eq 1 ]; then
 	unset PORTSDIR PORT_DBDIR TERM
 fi
 
-LISTPORTS=$(list_deps ${ORIGIN} )
+LISTPORTS=$(list_deps ${ORIGIN} testing )
 prepare_ports
 markfs prepkg ${MASTERMNT}