Attachment 610841 Details for Bug 855454 – Fix for the failing unit test

[patch] Fix for the failing unit test

gpgme-tests_gpg_t-encrypt-sign.patch (text/plain), 2.98 KB, created by John Morris on 2012-09-07 20:38:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Morris

Created: 2012-09-07 20:38:43 UTC

Size: 2.98 KB

patch

obsolete

>commit f38b7a45180a40e622a5a5c15381a9716587caf9
>Author: John Morris <john@zultron.com>
>Date:   Fri Sep 7 15:30:54 2012 -0500
>
>    Fix failing unit test, tests/gpg/t-encrypt-sign
>    
>    - Add patch 4:  gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>    
>    For more info:
>    http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>
>    - Also, .gitignore more 'fedpkg local' build artifacts (now that
>      it builds, we get the complete list ;)
>
>diff --git a/gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch b/gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>new file mode 100644
>index 0000000..d7f2efd
>--- /dev/null
>+++ b/gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>@@ -0,0 +1,18 @@
>+This patch fixes the t-encrypt-sign failing unit test; more info here:
>+
>+http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>+
>+diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
>+index 9da5ff0..9d00340 100644
>+--- a/tests/gpg/t-encrypt-sign.c
>++++ b/tests/gpg/t-encrypt-sign.c
>+@@ -60,7 +60,8 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
>+ 	       result->signatures->pubkey_algo);
>+       exit (1);
>+     }
>+-  if (result->signatures->hash_algo != GPGME_MD_SHA1)
>++  if (result->signatures->hash_algo != GPGME_MD_SHA1
>++      && result->signatures->hash_algo != GPGME_MD_RMD160)
>+     {
>+       fprintf (stderr, "Wrong hash algorithm reported: %i\n",
>+ 	       result->signatures->hash_algo);
>diff --git a/gpgme.spec b/gpgme.spec
>index 135dfa4..98897c6 100644
>--- a/gpgme.spec
>+++ b/gpgme.spec
>@@ -2,7 +2,7 @@
> Name:    gpgme
> Summary: GnuPG Made Easy - high level crypto API
> Version: 1.3.0
>-Release: 5%{?dist}
>+Release: 6%{?dist}
> 
> License: LGPLv2+
> Group:   Applications/System
>@@ -19,6 +19,10 @@ Patch2:  gpgme-1.3.0-ImplicitDSOLinking.patch
> # add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable
> Patch3:  gpgme-1.2.0-largefile.patch
> 
>+# fix t-encrypt-sign failing unit test; see:
>+# http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>+Patch4:  gpgme-1.3.0-tests_gpg_t-encrypt-sign_fix.patch
>+
> BuildRequires: gawk
> BuildRequires: gnupg2
> BuildRequires: gnupg2-smime
>@@ -58,6 +62,7 @@ Requires(postun): /sbin/install-info
> %patch1 -p1 -b .config_extras
> %patch2 -p1 -b .ImplicitDSOLinking
> %patch3 -p1 -b .largefile
>+%patch4 -p1 -b .t-encript-sign
> 
> ## HACK ALERT
> # The config script already suppresses the -L if it's /usr/lib, so cheat and
>@@ -124,6 +129,10 @@ fi
> 
> 
> %changelog
>+* Fri Sep  7 2012 John Morris <john@zultron.com> - 1.3.0-6
>+- Add patch to fix failing unit test:
>+  http://lists.gnupg.org/pipermail/gnupg-devel/2011-April/026054.html
>+
> * Fri Sep  7 2012 John Morris <john@zultron.com> - 1.3.0-5
> - re-enable gpg tests:
> -   specfile:  remove --disable on  %%configure line
>diff --git a/.gitignore b/.gitignore
>index 789221d..7490cca 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -4,6 +4,9 @@
> # ignore fedpkg local build artifacts
> /.build-*.log
> /gpgme-[0-9].[0-9].[0-9]/
>+/gpgme-*.src.rpm
>+/i686/
>+/x86_64/
> # ignore emacs cruft
> /.#*
> /#*

Actions: View | Diff

Attachments on bug 855454: 610835 | 610841 | 617397