summaryrefslogtreecommitdiff
path: root/regress/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-01-14 13:55:59 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-01-14 13:55:59 +0000
commitbe95fe37a46239e028cc37d6bf231a6722b97a11 (patch)
treee28d4856274f407eee36b5b00e876840ddd5206f /regress/usr.sbin
parent6289df0bb69ead9510339fd203c856bdc0db0cbc (diff)
set group+owner as some tests require both
Diffstat (limited to 'regress/usr.sbin')
-rw-r--r--regress/usr.sbin/pkg_add/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile
index a50d2046554..2878d475f71 100644
--- a/regress/usr.sbin/pkg_add/Makefile
+++ b/regress/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2010/01/10 16:06:10 espie Exp $
+# $OpenBSD: Makefile,v 1.34 2010/01/14 13:55:58 espie Exp $
REGRESS_TARGETS=pkgnames signatures depends-check longnames update-check1 \
collision-check3 partial-update-test conflict-update \
@@ -149,14 +149,16 @@ loop1: rep0/ocaml-3.11.1.tgz rep0/tcl-8.5.7.tgz rep0/tk-8.5.7.tgz
-@ROOT=${D20} PKG_PATH=${.OBJDIR}/rep0 ${PKG_ADD} -z ocaml-3.11.1p0 tcl-8.5.8 tk-8.5.8
plist1:
- @echo "@owner "`whoami` >$@
+ @echo "@owner "`id -un` >$@
+ @echo "@group "`id -gn` >>$@
@echo ${LONG1} >>$@
@echo ${LONG2} >>$@
@echo ${LONG3} >>$@
@echo ${LONG4} >>$@
plist2:
- @echo "@owner "`whoami` >$@
+ @echo "@owner "`id -un` >$@
+ @echo "@group "`id -gn` >>$@
@echo a >>$@
@echo b >>$@
@echo c >>$@
@@ -164,7 +166,8 @@ plist2:
@echo g >>$@
plist3:
- @echo "@owner "`whoami` >$@
+ @echo "@owner "`id -un` >$@
+ @echo "@group "`id -gn` >>$@
@echo a >>$@
@echo c >>$@
@echo d >>$@
@@ -187,7 +190,8 @@ plist7:
plist8:
@echo "@conflict o-<1" >$@
@echo "@pkgpath t/o" >>$@
- @echo "@owner "`whoami` >>$@
+ @echo "@owner "`id -un` >>$@
+ @echo "@group "`id -gn` >>$@
@echo '@lib lib/libcoincoin.so.$${LIBcoincoin_VERSION}' >>$@
plist9: