commit ff122962acc26409e1407612d4629412d57ad657 from: Stefan Sperling via: Thomas Adam date: Wed Nov 27 20:56:51 2024 UTC follow-up to previous commit: fix make target dependency order instead commit - 73416c724ee84bc1b4152944af4ddf376dd77621 commit + ff122962acc26409e1407612d4629412d57ad657 blob - f01afd24758ad2f44bbf835faf6a7fb6c14a593b blob + da61d900656f23e1f5ea8810eb86d427a36707db --- regress/gotwebd/Makefile +++ regress/gotwebd/Makefile @@ -59,7 +59,7 @@ gotwebd_libexec: @su -m ${GOTWEBD_TEST_USER} -c \ '${MAKE} -C ${.CURDIR}/../../gotwebd/libexec' >/dev/null 2>&1 -prepare_test_env: gotwebd_libexec ensure_root +prepare_test_env: ensure_root gotwebd_libexec @mkdir -p "${GOTWEBD_TEST_CHROOT}" @DESTDIR=${GOTWEBD_TEST_ROOT} \ ${MAKE} -C ${.CURDIR}/../../gotwebd/libexec install >/dev/null 2>&1 @@ -80,7 +80,7 @@ start_gotwebd: prepare_test_repo gotwebd_test @${GOTWEBD_TRAP}; ${GOTWEBD_START_CMD} @${GOTWEBD_TRAP}; sleep .5 -test_gotwebd: ensure_root start_gotwebd +test_gotwebd: start_gotwebd @-$(GOTWEBD_TRAP); su -m ${GOTWEBD_TEST_USER} -c \ 'env $(GOTWEBD_TEST_ENV) sh ${.CURDIR}/test_gotwebd.sh' @${GOTWEBD_STOP_CMD} 2>/dev/null