diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-31 10:46:16 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-31 10:46:16 +0000 |
| commit | 41448c9d98d2bbcafd23a756ec26f7a99f1145fd (patch) | |
| tree | ca05aa3b017a926eb7270dd8bd6f7f358c6730c0 /regress/usr.sbin/pkg_add/Makefile | |
| parent | 6dff9cac2ea7530668eecfc5d3c181f8c815f3cc (diff) | |
check for infinite loops in case of install problems
Diffstat (limited to 'regress/usr.sbin/pkg_add/Makefile')
| -rw-r--r-- | regress/usr.sbin/pkg_add/Makefile | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 2e9754af07e..a9d0a1b0c04 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.23 2009/12/12 17:15:58 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2009/12/31 10:46:15 espie Exp $ REGRESS_TARGETS=pkgnames depends-check longnames always-update \ collision-check3 partial-update-test conflict-update \ - merge-update split-update big-merge family-circus + merge-update split-update big-merge family-circus missing PKG_ADD=perl ${.CURDIR}/myadd PKG_CREATE=perl ${.CURDIR}/mycreate @@ -114,6 +114,11 @@ family-circus: old/glib-0.0.tgz old/fam-0.0.tgz new/fam-1.0.tgz new/glib-1.0.tgz ROOT=${D15} PKG_PATH=${.OBJDIR}/old ${PKG_ADD} glib ROOT=${D15} PKG_PATH=${.OBJDIR}/new ${PKG_ADD} -F updatedepends -u glib +missing: new/missa-0.tgz new/missb-0.tgz new/missc-0.tgz new/missd-0.tgz new/missf-0.tgz + -rm -rf ${D16} + ROOT=${D16} PKG_PATH=${.OBJDIR}/new ${PKG_ADD} missc + ROOT=${D15} PKG_PATH=${.OBJDIR}/new ${PKG_ADD} missa missb missf + plist1: @echo "@owner "`whoami` >$@ @echo ${LONG1} >>$@ @@ -165,12 +170,16 @@ plist10: @echo "@conflict fam-*" >$@ @echo "@pkgpath test/fam" >>$@ +plist11: + @echo "@conflict missc-*" >$@ + old/a-0.0.tgz: ${PKG_CREATE} -P'test/b:b-*:b-0.0' -f ${.CURDIR}/empty $@ new/a-1.0.tgz old/b-0.0.tgz old/i-0.0.tgz old/j-0.0.tgz new/j-1.0.tgz \ new/i-1.0.tgz old/k-0.0.tgz old/l-0.0.tgz new/l-1.0.tgz old/m-0.0.tgz \ -old/n-0.0.tgz new/m-1.0.tgz old/o-0.0.tgz old/fam-0.0.tgz: +old/n-0.0.tgz new/m-1.0.tgz old/o-0.0.tgz old/fam-0.0.tgz \ +new/missc-0.tgz: ${PKG_CREATE} -f ${.CURDIR}/empty $@ new/o-1.0.tgz: @@ -275,6 +284,18 @@ new/fam-1.0.tgz: plist9 new/gamin-0.0.tgz: plist10 ${PKG_CREATE} -f plist10 $@ +new/missa-0.tgz: + ${PKG_CREATE} -P'test/misse:misse-*:misse-0' -f ${.CURDIR}/empty $@ + +new/missb-0.tgz: + ${PKG_CREATE} -P'test/missd:missd-*:missd-0' -f ${.CURDIR}/empty $@ + +new/missd-0.tgz: plist11 + ${PKG_CREATE} -f plist11 $@ + +new/missf-0.tgz: + ${PKG_CREATE} -P'test/misse:misse-*:misse-0' -f ${.CURDIR}/empty $@ + # some extra tests do not yet pass correctly .PHONY: ${REGRESS_TARGETS} \ collision-check1 collision-check2 collision-check4 collision-check5 |