From 6f63b2d73bc4f885bf4a15e933386caa8b820951 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Thu, 3 Dec 2009 18:45:51 +0000 Subject: split-update test with shared libraries, twice the fun. --- regress/usr.sbin/pkg_add/Makefile | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'regress/usr.sbin') diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index 2d0982aa727..fbb7f07d993 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2009/12/02 11:40:12 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2009/12/03 18:45:50 espie Exp $ REGRESS_TARGETS=pkgnames depends-check longnames always-update \ collision-check3 partial-update-test conflict-update \ @@ -140,9 +140,16 @@ plist7: @echo "@conflict m-<1.0" >$@ @echo "@pkgpath test/m" >>$@ -plist8: +plist-p/PLIST: + @mkdir -p ${@D} @echo "@conflict o-<1.0" >$@ - @echo "@pkgpath test/n" >>$@ + @echo "@pkgpath test/o" >>$@ + @echo "@owner "`whoami` >>$@ + @echo "%%SHARED%%" >>$@ + +plist-p/PFRAG.shared: + @mkdir -p ${@D} + @echo '@lib lib/libcoincoin.so.$${LIBcoincoin_VERSION}' >$@ old/a-0.0.tgz: ${PKG_CREATE} -P'test/b:b-*:b-0.0' -f ${.CURDIR}/empty $@ @@ -153,10 +160,13 @@ 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 $@ + ${PKG_CREATE} -P'test/p:p-*:p-0.0' -W'coincoin.0.0' -f ${.CURDIR}/empty $@ + +new/p-0.0.tgz: p/PLIST p/PFRAG.shared + mkdir -p ${SRC13}/lib + @touch ${SRC13}/lib/libcoincoin.so.0.0 + ${PKG_CREATE} -B src13 -DSHARED_LIBS=1 -DLIBcoincoin_VERSION=0.0 -f p/PLIST $@ -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 $@ -- cgit v1.2.3