summaryrefslogtreecommitdiff
path: root/regress/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2009-11-15 08:38:20 +0000
committerMarc Espie <espie@cvs.openbsd.org>2009-11-15 08:38:20 +0000
commitd0544dc12072825a4947d6c3688de4285a3f24e2 (patch)
tree33b8b04752351ffc6f816f5bf6710c3d94c3ccb8 /regress/usr.sbin
parent280291f89a030c541475c7df1c3d76dd43b687a4 (diff)
repair things if dependencies exist
Diffstat (limited to 'regress/usr.sbin')
-rw-r--r--regress/usr.sbin/pkg_add/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile
index 166075e2bf3..7949c99c371 100644
--- a/regress/usr.sbin/pkg_add/Makefile
+++ b/regress/usr.sbin/pkg_add/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/11/14 21:04:24 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2009/11/15 08:38:19 espie Exp $
REGRESS_TARGETS=pkgnames depends-check longnames
@@ -44,11 +44,12 @@ collision-check2: new/d-0.0.tgz new/e-0.0.tgz
-rm -rf ${D4}/pkgdb/d-0.0
ROOT=${D4} ${PKG_ADD} new/e-0.0.tgz
-collision-check3: new/d-0.0.tgz new/e-0.0.tgz
+collision-check3: new/d-0.0.tgz new/f-0.0.tgz
-rm -rf ${D5}
- ROOT=${D5} ${PKG_ADD} new/d-0.0.tgz
+ ROOT=${D5} ${PKG_ADD} new/d-0.0.tgz new/f-0.0.tgz
-rm -rf ${D5}/pkgdb/d-0.0
ROOT=${D5} ${PKG_ADD} -F repair new/d-0.0.tgz
+ PKG_DBDIR=${D5}/pkgdb pkg_info -qR d
collision-check4: new/d-0.0.tgz new/e-0.0.tgz
-rm -rf ${D6}
@@ -121,6 +122,9 @@ new/e-0.0.tgz: plist3
echo "coucou" >${SRC3}/g
${PKG_CREATE} -B ${.OBJDIR}/src3 -f ${.OBJDIR}/plist3 $@
+new/f-0.0.tgz:
+ ${PKG_CREATE} -P'test/d:d-*:d-0.0' -f ${.CURDIR}/empty $@
+
.PHONY: pkgnames depends-check longnames \
collision-check1 collision-check2 collision-check3 \
collision-check4 collision-check5