aboutsummaryrefslogtreecommitdiffstats
path: root/tests/openpgp/gpgtar.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/openpgp/gpgtar.test')
-rwxr-xr-xtests/openpgp/gpgtar.test14
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/openpgp/gpgtar.test b/tests/openpgp/gpgtar.test
index 5cb2353c4..acfaf3fa1 100755
--- a/tests/openpgp/gpgtar.test
+++ b/tests/openpgp/gpgtar.test
@@ -25,24 +25,30 @@ TESTFILES="$plain_files $data_files"
TESTDIR=gpgtar.d
FILELIST="${TESTDIR}/filelist"
GPG=../../g10/gpg2
+GPGARGS="--trust-model=always"
+
GPGTAR="../../tools/gpgtar"
-GPGZIP="sh ../../tools/gpg-zip --gpg-args --trust-model=always"
+GPGZIP="sh ../../tools/gpg-zip"
for TOOL in "$GPGTAR" "$GPGZIP"
do
rm -rf -- "${TESTDIR}"
mkdir "${TESTDIR}"
- $TOOL --gpg "$GPG" --encrypt --recipient "$usrname2" \
+ $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" \
+ --encrypt --recipient "$usrname2" \
--output "${TESTDIR}/test.tar.pgp" $TESTFILES
- $TOOL --gpg "$GPG" --list-archive "${TESTDIR}/test.tar.pgp" >"$FILELIST"
+ $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" \
+ --list-archive "${TESTDIR}/test.tar.pgp" \
+ >"$FILELIST"
for F in $TESTFILES
do
grep -qe "\\b${F}\\b" "$FILELIST"
done
- $TOOL --gpg "$GPG" --tar-args --directory="${TESTDIR}" \
+ $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" \
+ --tar-args --directory="${TESTDIR}" \
--decrypt "${TESTDIR}/test.tar.pgp"
for F in $TESTFILES
do