diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2020-04-03 12:01:57 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2020-04-03 12:01:57 +0000 |
| commit | c3f8aa02fc792b04966d30d4092d270cbc6af4be (patch) | |
| tree | 5ef7fbcc050c1deda5c5eb0b61b63ea027d2dd5e /regress | |
| parent | fcf73cb020d3b25f6ac24dd34620939b155cbc7f (diff) | |
Make signify regress work without obj dir. Avoid including the
output archive by reducing the input file list to text files only.
from Christian Ludwig; OK beck@
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/signify/Makefile | 7 | ||||
| -rw-r--r-- | regress/usr.bin/signify/signify.sh | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/regress/usr.bin/signify/Makefile b/regress/usr.bin/signify/Makefile index 208bc5eff38..dd4054b3c85 100644 --- a/regress/usr.bin/signify/Makefile +++ b/regress/usr.bin/signify/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2014/03/17 02:49:02 tedu Exp $ +# $OpenBSD: Makefile,v 1.5 2020/04/03 12:01:56 bluhm 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: - @sh ${.CURDIR}/signify.sh ${.CURDIR} + sh ${.CURDIR}/signify.sh ${.CURDIR} .PHONY: t1 diff --git a/regress/usr.bin/signify/signify.sh b/regress/usr.bin/signify/signify.sh index d83dff79b19..13d8319a1a8 100644 --- a/regress/usr.bin/signify/signify.sh +++ b/regress/usr.bin/signify/signify.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: signify.sh,v 1.9 2019/12/09 09:41:54 espie Exp $ +# $OpenBSD: signify.sh,v 1.10 2020/04/03 12:01:56 bluhm Exp $ srcdir=$1 @@ -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 |