diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-12-02 11:40:13 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-12-02 11:40:13 +0000 |
| commit | 2db45998b260d694a26cfb1531c952f1f874347e (patch) | |
| tree | 95c8757bacdebe6e1b3105cb3d5803962db45ab1 | |
| parent | 68a49326b018f298207b00b15793befb7a2d7cbe (diff) | |
and check result
| -rw-r--r-- | regress/usr.sbin/pkg_add/Makefile | 5 | ||||
| -rw-r--r-- | regress/usr.sbin/pkg_add/list5.out | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 34d5706eacd..2d0982aa727 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.17 2009/12/02 11:21:42 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2009/12/02 11:40:12 espie Exp $ REGRESS_TARGETS=pkgnames depends-check longnames always-update \ collision-check3 partial-update-test conflict-update \ - merge-update + merge-update split-update PKG_ADD=perl ${.CURDIR}/myadd PKG_CREATE=perl ${.CURDIR}/mycreate @@ -100,6 +100,7 @@ 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 + PKG_DBDIR=${D13}/pkgdb pkg_info -q |diff - ${.CURDIR}/list5.out plist1: @echo "@owner "`whoami` >$@ diff --git a/regress/usr.sbin/pkg_add/list5.out b/regress/usr.sbin/pkg_add/list5.out new file mode 100644 index 00000000000..f50bccaaf82 --- /dev/null +++ b/regress/usr.sbin/pkg_add/list5.out @@ -0,0 +1,2 @@ +o-1.0 +p-0.0 |