diff options
| author | Werner Koch <[email protected]> | 2018-03-20 10:13:14 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-03-20 10:13:14 +0000 |
| commit | 44f9e80ea99733f373d75c3632273f763e6f5853 (patch) | |
| tree | b3a504019e761a7624908058a0987eab01bf4505 /tests | |
| parent | json: Add framework for the gpgme-json tool (diff) | |
| parent | core: Do not clobber R_KEY in gpgme_get_key on error. (diff) | |
| download | gpgme-44f9e80ea99733f373d75c3632273f763e6f5853.tar.gz gpgme-44f9e80ea99733f373d75c3632273f763e6f5853.zip | |
Merge branch 'master' into json-tool
Diffstat (limited to '')
| -rw-r--r-- | tests/gpg/t-support.h | 6 | ||||
| -rw-r--r-- | tests/run-support.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h index f6dec682..ef5766a3 100644 --- a/tests/gpg/t-support.h +++ b/tests/gpg/t-support.h @@ -196,7 +196,8 @@ print_import_result (gpgme_import_result_t r) " secret imported: %d\n" " secret unchanged: %d\n" " skipped new keys: %d\n" - " not imported: %d\n", + " not imported: %d\n" + " skipped v3 keys: %d\n", r->considered, r->no_user_id, r->imported, @@ -210,6 +211,7 @@ print_import_result (gpgme_import_result_t r) r->secret_imported, r->secret_unchanged, r->skipped_new_keys, - r->not_imported); + r->not_imported, + r->skipped_v3_keys); } diff --git a/tests/run-support.h b/tests/run-support.h index 6a2170b0..6c713a9a 100644 --- a/tests/run-support.h +++ b/tests/run-support.h @@ -177,7 +177,8 @@ print_import_result (gpgme_import_result_t r) " secret imported: %d\n" " secret unchanged: %d\n" " skipped new keys: %d\n" - " not imported: %d\n", + " not imported: %d\n" + " skipped v3 keys: %d\n", r->considered, r->no_user_id, r->imported, @@ -191,6 +192,7 @@ print_import_result (gpgme_import_result_t r) r->secret_imported, r->secret_unchanged, r->skipped_new_keys, - r->not_imported); + r->not_imported, + r->skipped_v3_keys); } |