From: anton Date: Tue, 1 Mar 2022 06:13:17 +0000 (+0000) Subject: ci(1) populates the author keyword using getlogin(2), therefore favor X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=56df5ce82fbd595c44191db98a21edb83de3356f;p=openbsd ci(1) populates the author keyword using getlogin(2), therefore favor logname(1) when normalizing the output. --- diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile index 17c0f9b97b6..8df70c9fa2d 100644 --- a/regress/usr.bin/rcs/Makefile +++ b/regress/usr.bin/rcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2021/07/10 12:25:46 anton Exp $ +# $OpenBSD: Makefile,v 1.46 2022/03/01 06:13:17 anton Exp $ # Regression tests by Niall O'Higgins . # ksh -> Makefile by Ray Lai . @@ -602,7 +602,8 @@ test-ci-keywords: clean @sed 's/.*/$$&$$/' ${.CURDIR}/keywords.in > file @sed 's/^[A-Z][A-Z]*[a-z][a-z]*: .*/$$&$$/' ${.CURDIR}/keywords.out > newfile @echo . | ${CI} -q -u file - @sed -e 's,${USER},USER,' -e "s/\($$[A-Z][a-z]*: \).*file,v/\1file,v/" \ + @sed -e "s,$$(logname),USER," \ + -e "s/\($$[A-Z][a-z]*: \).*file,v/\1file,v/" \ -e 's,[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9],YYYY/MM/DD HH:MI:SS,' \ file | ${DIFF} newfile -