Skip to content

Commit a5f0341

Browse files
committed
ci: Redirect output for builds.
This target is far too noisy to be at all useful. Save the output ala make universe in _. files. Also report where to find errors. Sponsored by: Netflix
1 parent be3631b commit a5f0341

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

tests/ci/Makefile

+15-3
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,31 @@ beforeclean: .PHONY
147147
clean: beforeclean .PHONY
148148

149149
ci-buildworld: .PHONY
150-
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} buildworld
150+
@echo "Building world for ${TARGET_ARCH}"
151+
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
152+
${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} \
153+
buildworld > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
154+
(echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false)
155+
151156

152157
ci-buildkernel: ci-buildworld-${TARGET_ARCH:tl} .PHONY
153-
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} ${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} SRCCONF=${SRCCONF} buildkernel
158+
@echo "Building kenrel for ${TARGET_ARCH"}"
159+
${IMAKE} -j${PARALLEL_JOBS} -C ${WORLDDIR} ${METAMODE} \
160+
${CROSS_TOOLCHAIN_PARAM} __MAKE_CONF=${MAKECONF} \
161+
SRCCONF=${SRCCONF} buildkernel > ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
162+
(echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false)
154163

155164
ci-buildimage: ${QEMUTGT} ci-buildkernel-${TARGET_ARCH:tl} .PHONY
165+
@echo "Building ci image for ${TARGET_ARCH"}"
156166
mkdir -p ${.OBJDIR}/${.TARGET}
157167
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
158168
QEMUSTATIC=${QEMUSTATIC} CITYPE=${CITYPE} \
159169
${RELEASEDIR}/scripts/mk-vmimage.sh \
160170
-C ${RELEASEDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${VMFS} \
161171
-i ${.OBJDIR}/ci.img -s ${VMSIZE} -f ${FORMAT} \
162-
-S ${WORLDDIR} -o ${.OBJDIR}/${CIIMAGE} -c ${CICONF}
172+
-S ${WORLDDIR} -o ${.OBJDIR}/${CIIMAGE} -c ${CICONF} \
173+
> ${.CURDIR}/_.${TARGET_ARCH}.${.TARGET} 2>&1 || \
174+
(echo "${.TARGET} failed, check _.${TARGET_ARCH}.${.TARGET} for details" ; false)
163175
touch ${.TARGET}
164176

165177
ci-setsmokevar: .PHONY

0 commit comments

Comments
 (0)