commit - c7694689e60e8a353efa0358e5852f1f50abbf04a9e9ed0b724ca4d3e7bee84e
commit + 1a201d3a3d7a268be170cb71688ea1d7d0ca79523076f50ff5a423f7806397dd
blob - f3423747aab3b378b03bc9c426cecf2ccc1672558ec7f7f64f6b55f3b8f76130
blob + f8b5edec2fcdaa558f826d6a5bee8ba4514f69d03c7f0ba7f0a5c3de8e42c4b7
--- regress/gotsysd/Makefile
+++ regress/gotsysd/Makefile
${GOTSYSD_TEST_VM_BASE_IMAGE} ${GOTSYSD_VM_PASSWD_FILE} ${GOTD_CONF} \
${GOTSYSD_CONF} ${GOTSYS_CONF} ${GOT_CONF} ${INSTALL_SITE}
-.PHONY: ensure_root vm start_test_vm
+.PHONY: ensure_root vm start_test_vm build_got
GOTSYSD_TEST_ROOT=/tmp
GOTSYSD_TEST_DIR!!=mktemp -d "$(GOTSYSD_TEST_ROOT)/gotsysd-test-XXXXXXXXXX"
${GOT_CONF}:
@${UNPRIV} "echo author \\'${GOTSYSD_TEST_USER} \\<${GOTSYSD_TEST_USER}@localhost\\>\\' > $@"
-setup_test_vm: start_test_vm ${GOTD_CONF} ${GOTSYSD_CONF} ${GOTSYS_CONF} ${GOT_CONF}
+build_got:
@set -e; \
VMID=`vmctl status ${GOTSYSD_VM_NAME} | tail -n1 | \
awk '{print $$1}'`; \
make -C /home/${GOTSYSD_TEST_USER}/src/got -- GOT_RELEASE=Yes \
DEBUG=\\'-Oo -g\\' sysd-install server-install webd-install install"; \
${UNPRIV} "${GOTSYSD_SSH_CMD} -- root@$${VMIP} \
- ln -s gitwrapper /usr/local/bin/git-upload-pack"; \
+ ln -f -s gitwrapper /usr/local/bin/git-upload-pack"; \
${UNPRIV} "${GOTSYSD_SSH_CMD} -- root@$${VMIP} \
- ln -s gitwrapper /usr/local/bin/git-receive-pack"; \
+ ln -f -s gitwrapper /usr/local/bin/git-receive-pack"
+
+setup_test_vm: start_test_vm build_got ${GOTD_CONF} ${GOTSYSD_CONF} ${GOTSYS_CONF} ${GOT_CONF}
+ @set -e; \
+ VMID=`vmctl status ${GOTSYSD_VM_NAME} | tail -n1 | \
+ awk '{print $$1}'`; \
+ VMIP="100.64.$$VMID.3"; \
+ ${UNPRIV} "ssh-keygen -R $${VMIP}"; \
${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} sysctl kern.nosuidcoredump=3"; \
${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} mkdir -p /var/crash/gotd "; \
${UNPRIV} "${GOTSYSD_SSH_CMD} root@$${VMIP} mkdir -p /var/crash/gotsysd "; \