Skip to content

Commit d29848c

Browse files
committed
Hook up running make test with testport.
1 parent 204f1e2 commit d29848c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/share/poudriere/common.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,7 +2090,7 @@ _real_build_port() {
20902090
# Don't need to install if only making packages and not
20912091
# testing.
20922092
[ -n "${PORTTESTING}" ] && \
2093-
install_order="${install_order} install-mtree install"
2093+
install_order="${install_order} test install-mtree install"
20942094
fi
20952095
targets="check-sanity pkg-depends fetch-depends fetch checksum \
20962096
extract-depends extract patch-depends patch build-depends \
@@ -2235,7 +2235,12 @@ _real_build_port() {
22352235
bset_job_status "${phase}/timeout" "${port}"
22362236
job_msg_verbose "Status for build ${COLOR_PORT}${port}${COLOR_RESET}: ${COLOR_PHASE}timeout"
22372237
fi
2238-
return 1
2238+
if [ "${phase}" = "test" -a "${PORTTESTING_FATAL}" = "no" ]; then
2239+
msg "Error: test failures detected"
2240+
testfailure=2
2241+
else
2242+
return 1
2243+
fi
22392244
fi
22402245
fi
22412246

0 commit comments

Comments
 (0)