diff options
| author | Justus Winter <[email protected]> | 2015-11-26 13:08:48 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2015-11-26 13:28:22 +0000 |
| commit | 2eb3248058330dd5c37560d9887db5b5266c54fe (patch) | |
| tree | aedaeff4b458f52fbb3f55cdb69041261166dd8b /tests | |
| parent | tools/gpgtar: Rework argument parsing. (diff) | |
| download | gnupg-2eb3248058330dd5c37560d9887db5b5266c54fe.tar.gz gnupg-2eb3248058330dd5c37560d9887db5b5266c54fe.zip | |
tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
* tools/gpgtar.c (enum cmd_and_opt_values): New value.
(opts): Add new group for tar options, rearrange a little, add
'--tar-args'.
(tar_opts): New variable.
(shell_parse_stringlist): New function.
(shell_parse_argv): Likewise.
(parse_arguments): Add option argument, handle '--tar-args'.
(main): Fix invokation of 'parse_arguments'.
* tests/openpgp/gpgtar.test: Simplify decryption.
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/openpgp/gpgtar.test | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/openpgp/gpgtar.test b/tests/openpgp/gpgtar.test index 7d55862b8..5cb2353c4 100755 --- a/tests/openpgp/gpgtar.test +++ b/tests/openpgp/gpgtar.test @@ -42,12 +42,8 @@ do grep -qe "\\b${F}\\b" "$FILELIST" done - EXTRACT_FLAGS="--directory=${TESTDIR}" - if [ "$TOOL" = "$GPGZIP" ] - then - EXTRACT_FLAGS="--tar-args $EXTRACT_FLAGS" - fi - $TOOL --gpg "$GPG" $EXTRACT_FLAGS --decrypt "${TESTDIR}/test.tar.pgp" + $TOOL --gpg "$GPG" --tar-args --directory="${TESTDIR}" \ + --decrypt "${TESTDIR}/test.tar.pgp" for F in $TESTFILES do diff -q "$F" "${TESTDIR}/$F" |