Move stage-qa and check-leftovers to right after stage

2 files changed, 29 insertions, 39 deletions

diff --git a/src/share/poudriere/awk/processonelog2.awk b/src/share/poudriere/awk/processonelog2.awk
index 50c44910..ce38c1ad 100644
--- a/src/share/poudriere/awk/processonelog2.awk
+++ b/src/share/poudriere/awk/processonelog2.awk
@@ -1,7 +1,7 @@
 # Read a single errorlogfile and output a phase
 /Filesystem touched during build/	{ res[0]="build_fs_violation" }
 /Filesystem touched during stage/	{ res[1]="stage_fs_violation" }
-/check\-orphans failures/		{ res[2]="stage_orphans" }
+/check\-orphans failures/		{ res[2]="check-orphans" }
 /stage\-qa failures/			{ res[3]="stage-qa" }
 /Files or directories (left over|removed|modified)/	{ res[4]="leftovers" }
 
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 30024dad..39277327 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -1541,32 +1541,6 @@ _real_build_port() {
 			chown -R ${JUSER} ${mnt}/new_packages
 		fi
 
-		if [ "${phase}" = "deinstall" ]; then
-			PREFIX=$(injail env ${PORT_FLAGS} make -C ${portdir} -VPREFIX)
-			if [ -z "${no_stage}" ]; then
-				bset ${MY_JOBID} status "stage_orphans:${port}"
-				local die=0
-
-				if ! injail env DEVELOPER=1 \
-				    make -C ${portdir} check-orphans; then
-					msg "Error: check-orphans failures detected"
-					die=1
-				fi
-
-				[ ${die} -eq 1 -a "${0##*/}" = "testport.sh" -a \
-				    "${PREFIX}" != "${LOCALBASE}" ] && msg \
-				    "This test was done with PREFIX!=LOCALBASE which \
-may show failures if the port does not respect PREFIX. \
-Try testport with -n to use PREFIX=LOCALBASE"
-				[ $die -eq 0 ] || if [ "${PORTTESTING_FATAL}" != "no" ]; then
-					return 1
-				else
-					testfailure=2
-					die=0
-				fi
-			fi
-		fi
-
 		if [ "${phase#*-}" = "depends" ]; then
 			# No need for nohang or PORT_FLAGS for *-depends
 			injail env USE_PACKAGE_DEPENDS_ONLY=1 ${phaseenv} \
@@ -1616,6 +1590,33 @@ Try testport with -n to use PREFIX=LOCALBASE"
 			gather_distfiles ${portdir} ${mnt}/portdistfiles ${DISTFILES_CACHE} || return 1
 		fi
 
+		if [ "${phase}" = "stage" -a -n "${PORTTESTING}" ]; then
+			local die=0
+
+			bset ${MY_JOBID} status "stage-qa:${port}"
+			if ! injail env DEVELOPER=1 ${PORT_FLAGS} \
+			    make -C ${portdir} stage-qa; then
+				msg "Error: stage-qa failures detected"
+				[ "${PORTTESTING_FATAL}" != "no" ] &&
+					return 1
+				die=1
+			fi
+
+			bset ${MY_JOBID} status "check-orphans:${port}"
+			if ! injail env DEVELOPER=1 ${PORT_FLAGS} \
+			    make -C ${portdir} check-orphans; then
+				msg "Error: check-orphans failures detected"
+				[ "${PORTTESTING_FATAL}" != "no" ] &&
+					return 1
+				die=1
+			fi
+
+			if [ ${die} -eq 1 ]; then
+				testfailure=2
+				die=0
+			fi
+		fi
+
 		if [ "${phase}" = "deinstall" ]; then
 			local add=$(mktemp ${mnt}/tmp/add.XXXXXX)
 			local add1=$(mktemp ${mnt}/tmp/add1.XXXXXX)
@@ -1624,18 +1625,7 @@ Try testport with -n to use PREFIX=LOCALBASE"
 			local mod=$(mktemp ${mnt}/tmp/mod.XXXXXX)
 			local mod1=$(mktemp ${mnt}/tmp/mod1.XXXXXX)
 			local die=0
-
-			# Check stage-qa first
-			if [ -z "${no_stage}" ]; then
-				bset ${MY_JOBID} status "stage-qa:${port}"
-				if ! injail env DEVELOPER=1 \
-				    make -C ${portdir} stage-qa; then
-					msg "Error: stage-qa failures detected"
-					[ "${PORTTESTING_FATAL}" != "no" ] &&
-						return 1
-					die=1
-				fi
-			fi
+			PREFIX=$(injail env ${PORT_FLAGS} make -C ${portdir} -VPREFIX)
 
 			msg "Checking for extra files and directories"
 			bset ${MY_JOBID} status "leftovers:${port}"