build: Fix make distcheck problem.

* tests/start-stop-agent: Use -f with rm.  Also use cat instead of cp.
--

Also shorted some lines.
This commit is contained in:
Werner Koch 2021-08-27 14:13:18 +02:00
parent 8fe1546282
commit aaf448b1e8
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 4 additions and 4 deletions

View File

@ -38,8 +38,8 @@ endif
c_tests = \ c_tests = \
t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \ t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
t-decrypt t-verify t-decrypt-verify t-sig-notation t-export \ t-decrypt t-verify t-decrypt-verify t-sig-notation t-export \
t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait \ t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait \
t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign \ t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign \
$(tests_unix) $(tests_unix)
TESTS = initial.test $(c_tests) final.test TESTS = initial.test $(c_tests) final.test

View File

@ -36,10 +36,10 @@ for F in gpg.conf gpgsm.conf
do do
if test -f "$GNUPGHOME/$F" if test -f "$GNUPGHOME/$F"
then then
mv "$GNUPGHOME/$F" "$GNUPGHOME/$F~" cat "$GNUPGHOME/$F" > "$GNUPGHOME/$F~"
sed -e "s#^agent-program.*#agent-program ${GPG_AGENT}|--debug-quick-random#" \ sed -e "s#^agent-program.*#agent-program ${GPG_AGENT}|--debug-quick-random#" \
>"$GNUPGHOME/$F" <"$GNUPGHOME/$F~" >"$GNUPGHOME/$F" <"$GNUPGHOME/$F~"
rm "$GNUPGHOME/$F~" rm -f "$GNUPGHOME/$F~"
fi fi
done done