You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.5 KiB
40 lines
1.5 KiB
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
|
Date: Tue, 13 Sep 2016 14:31:38 -0400
|
|
Subject: add $gpg_is_modern to test suite
|
|
|
|
MyTestSpecific.pm now produces a new variable indicating whether it
|
|
the version of GnuPG we run against is from the "Modern" line of GnuPG
|
|
development (2.1 or later). This will be useful when comparing output
|
|
that we can't expect from earlier versions.
|
|
---
|
|
t/MyTestSpecific.pm | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/t/MyTestSpecific.pm b/t/MyTestSpecific.pm
|
|
index 1af98ae..a309698 100644
|
|
--- a/t/MyTestSpecific.pm
|
|
+++ b/t/MyTestSpecific.pm
|
|
@@ -29,17 +29,20 @@ use GnuPG::Handles;
|
|
use vars qw( @ISA @EXPORT
|
|
$stdin $stdout $stderr
|
|
$gpg_program $handles $gnupg
|
|
- %texts
|
|
+ %texts $gpg_is_modern
|
|
);
|
|
|
|
@ISA = qw( Exporter );
|
|
@EXPORT = qw( stdin stdout stderr
|
|
gnupg_program handles reset_handles
|
|
- texts file_match
|
|
+ texts file_match gpg_is_modern
|
|
);
|
|
|
|
$gnupg = GnuPG::Interface->new( passphrase => 'test' );
|
|
|
|
+my @version = split('\.', $gnupg->version());
|
|
+$gpg_is_modern = ($version[0] > 2 || ($version[0] == 2 && $version[1] >= 1));
|
|
+
|
|
$gnupg->options->hash_init( homedir => 'test/gnupghome',
|
|
armor => 1,
|
|
meta_interactive => 0,
|