diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-02 11:21:43 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-02 11:21:43 +0000 |
| commit | e1a76150c9cf923ce6dc469cb19a7a4dd0b10be2 (patch) | |
| tree | 7551683dd1ab949d59ace92243d2d1c07a675082 | |
| parent | c354d4fbb738c6758b385c3ad2412be2917dcbe5 (diff) | |
splitted update: a -> a + b with inter-dependencies
| -rw-r--r-- | regress/usr.sbin/pkg_add/Makefile | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 3c6a04aed21..34d5706eacd 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2009/11/22 12:57:35 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2009/12/02 11:21:42 espie Exp $ REGRESS_TARGETS=pkgnames depends-check longnames always-update \ collision-check3 partial-update-test conflict-update \ @@ -11,7 +11,7 @@ LONG2=iamanotherreallygfilenamethatcantberepresentedcorrectlyinatararchivebutwew LONG3=iamanotherreallylonglinkthatcantberepresentedcorrectlyinatararchivebutwewantittohappenanywaysohmygodaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa42 LONG4=iamanotherreallylonghardlinkthatcantberepresentedcorrectlyinatararchivebutwewantittohappenanywaysohmygodaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa42 -.for i in 1 2 3 4 5 6 7 8 9 10 11 12 +.for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 S$i ?= ${.OBJDIR}/src$i SRC$i ?= ${S$i}/usr/local D$i ?= ${.OBJDIR}/dest$i @@ -96,6 +96,11 @@ merge-update: old/m-0.0.tgz old/n-0.0.tgz new/m-1.0.tgz new/n-1.0.tgz ROOT=${D12} PKG_PATH=${.OBJDIR}/new ${PKG_ADD} -u n PKG_DBDIR=${D12}/pkgdb pkg_info -q|diff - ${.CURDIR}/list4.out +split-update: old/o-0.0.tgz new/o-1.0.tgz new/p-0.0.tgz + -rm -rf ${D13} + ROOT=${D13} PKG_PATH=${.OBJDIR}/old ${PKG_ADD} o + ROOT=${D13} PKG_PATH=${.OBJDIR}/new ${PKG_ADD} -u o + plist1: @echo "@owner "`whoami` >$@ @echo ${LONG1} >>$@ @@ -134,14 +139,24 @@ plist7: @echo "@conflict m-<1.0" >$@ @echo "@pkgpath test/m" >>$@ +plist8: + @echo "@conflict o-<1.0" >$@ + @echo "@pkgpath test/n" >>$@ + 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/n-0.0.tgz new/m-1.0.tgz old/o-0.0.tgz: ${PKG_CREATE} -f ${.CURDIR}/empty $@ +new/o-1.0.tgz: + ${PKG_CREATE} -P'test/p:p-*:p-0.0' -f ${.CURDIR}/empty $@ + +new/p-0.0.tgz: plist8 + ${PKG_CREATE} -f plist8 $@ + new/b-1.0.tgz: ${PKG_CREATE} -P'test/a:a-*:a-1.0' -f ${.CURDIR}/empty $@ |