On Thu, Apr 02, 2020 at 08:03:33AM +0000, Christian Ludwig wrote: > The signify regression test creates a tar archive from the test's > directory. Without a symlink to the obj directory, the output tarball is > part of the input file list. This makes tar complain that archive.tgz > was modified during copy to archive.
Thanks, commited. bluhm > Avoid including the output archive by reducing the input file list to > text files only. > > While there, tweak the list of files to clean. > --- > regress/usr.bin/signify/Makefile | 3 ++- > regress/usr.bin/signify/signify.sh | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/regress/usr.bin/signify/Makefile > b/regress/usr.bin/signify/Makefile > index 208bc5eff38..6fff3450e11 100644 > --- a/regress/usr.bin/signify/Makefile > +++ b/regress/usr.bin/signify/Makefile > @@ -1,6 +1,7 @@ > # $OpenBSD: Makefile,v 1.4 2014/03/17 02:49:02 tedu Exp $ > > -CLEANFILES += test.sig confirmorders confirmorders.sig HASH.sig > +CLEANFILES += test.sig confirmorders confirmorders.sig HASH HASH.sig \ > + archive.tgz signed.tgz > REGRESS_TARGETS = t1 > > t1: > diff --git a/regress/usr.bin/signify/signify.sh > b/regress/usr.bin/signify/signify.sh > index d83dff79b19..5c2d86dec98 100644 > --- a/regress/usr.bin/signify/signify.sh > +++ b/regress/usr.bin/signify/signify.sh > @@ -28,7 +28,7 @@ signify -S -e -s $seckey -m HASH > rm HASH > signify -C -q -p $pubkey -x HASH.sig > > -tar zcPf archive.tgz $srcdir > +tar zcPf archive.tgz $srcdir/*.txt > signify -zS -s $seckey -m archive.tgz -x signed.tgz > # check it's still valid gzip > gunzip -t signed.tgz > -- > 2.26.0
