Commit Diff

Commit:
62192466ab5788fb06092a4aed86ed2682cdee81
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make it easier to run gotd regress via doas(1); ok kn, tracey
Actions:
Patch | Tree
commit - b1142068fd26fa24285c533f10e3afcb61719759
commit + 62192466ab5788fb06092a4aed86ed2682cdee81
blob - cd20ee9bf8631fcd757767edf78df5f410e56161
blob + 1f10771a98fe00cf4c3029d94a41ae32341873e7
--- regress/gotd/Makefile
+++ regress/gotd/Makefile
@@ -12,7 +12,7 @@ GOTD_DEVUSER_HOME!=userinfo $(GOTD_DEVUSER) | awk '/^d
 GOTD_TEST_REPO!?=mktemp -d "$(GOTD_TEST_ROOT)/gotd-test-repo-XXXXXXXXX"
 GOTD_TEST_REPO_URL=ssh://${GOTD_DEVUSER}@127.0.0.1/test-repo
 
-GOTD_TEST_USER?=${LOGNAME}
+GOTD_TEST_USER?=${USERNAME}
 GOTD_TEST_USER_HOME!=userinfo $(GOTD_TEST_USER) | awk '/^dir/ {print $$2}'
 
 # gotd.conf parameters
@@ -34,8 +34,12 @@ GOTD_TEST_ENV=GOTD_TEST_ROOT=$(GOTD_TEST_ROOT) \
 
 ensure_root:
 	@if [[ `id -u` -ne 0 ]]; then \
-		echo gotd test suite must be run by root >&2; \
+		echo gotd test suite must be started by root >&2; \
 		false; \
+	fi ; \
+	if [[ "$(GOTD_TEST_USER)" = "root" ]]; then \
+		echo GOTD_TEST_USER must be a non-root user >&2; \
+		false; \
 	fi
 
 start_gotd_ro: ensure_root