[xml/sgml-commit] [xmlsec1] 01/01: update skip-failing-tests.patch

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository xmlsec1.

commit 0bac84c07a04f49db88f9b8d2694582510e25d3a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Jun 25 21:15:05 2017 +0200

    update skip-failing-tests.patch
---
 debian/changelog                        |  2 +-
 debian/patches/skip-failing-tests.patch | 36 +++++++++++----------------------
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ae25e2..bff3d1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ xmlsec1 (1.2.24-2) experimental; urgency=medium
   * merge from Ubuntu:
     - Enable test suite execution during package build (closes: #774631)
 
- -- Rene Engelhard <rene at debian.org>  Thu, 22 Jun 2017 18:54:56 +0200
+ -- Rene Engelhard <rene at debian.org>  Sun, 25 Jun 2017 21:15:16 +0200
 
 xmlsec1 (1.2.24-1) unstable; urgency=medium
 
diff --git a/debian/patches/skip-failing-tests.patch b/debian/patches/skip-failing-tests.patch
index d99d2a2..0d2be68 100644
--- a/debian/patches/skip-failing-tests.patch
+++ b/debian/patches/skip-failing-tests.patch
@@ -5,41 +5,29 @@ Description: Skip failing tests due to disabled lib plugins
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
+diff --git a/tests/testDSig.sh b/tests/testDSig.sh
+index 5ef44a4..c90f4dd 100755
 --- a/tests/testDSig.sh
 +++ b/tests/testDSig.sh
-@@ -788,6 +788,8 @@ execDSigTest $res_success \
+@@ -842,7 +842,7 @@ execDSigTest $res_success \
  # test dynamic signature
  #
  ##########################################################################
-+
-+if [ $crypto = 'openssl' ]; then
+-if [ -n "$XMLSEC_TEST_NAME" -a "$XMLSEC_TEST_NAME" = "dsig-dynamic" ]; then
++if [ -n "$XMLSEC_TEST_NAME" -a "$XMLSEC_TEST_NAME" = "dsig-dynamic" -a "$crypto" = 'openssl' ]; then
  echo "Dynamic signature template"
  printf "    Create new signature                                 "
- echo "$xmlsec_app sign-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile" >> $logfile
-@@ -797,6 +799,7 @@ printf "    Verify new signature
- echo "$xmlsec_app verify --keys-file $keysfile $tmpfile" >> $logfile
- $VALGRIND $xmlsec_app verify $xmlsec_params --keys-file $keysfile $tmpfile >> $logfile 2>> $logfile
- printRes $res_success $?
-+fi
- 
- 
- ##########################################################################
+ echo "$VALGRIND $xmlsec_app sign-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile" >> $logfile
+diff --git a/tests/testEnc.sh b/tests/testEnc.sh
+index 9970e33..f9ab2da 100755
 --- a/tests/testEnc.sh
 +++ b/tests/testEnc.sh
-@@ -366,6 +366,8 @@ execEncTest $res_success \
+@@ -366,7 +366,7 @@ execEncTest $res_success \
  # test dynamicencryption
  #
  ##########################################################################
-+
-+if [ $crypto = 'openssl' ]; then
+-if [ -n "$XMLSEC_TEST_NAME" -a "$XMLSEC_TEST_NAME" = "enc-dynamic" ]; then
++if [ -n "$XMLSEC_TEST_NAME" -a "$XMLSEC_TEST_NAME" = "enc-dynamic" -a $crypto = 'openssl']; then
  echo "Dynamic encryption template"
  printf "    Encrypt template                                     "
- echo "$xmlsec_app encrypt-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile" >> $logfile
-@@ -375,6 +377,7 @@ printf "    Decrypt document
- echo "$xmlsec_app decrypt $xmlsec_params $keysfile $tmpfile" >> $logfile
- $VALGRIND $xmlsec_app decrypt $xmlsec_params --keys-file $keysfile $tmpfile >> $logfile 2>> $logfile
- printRes $res_success $?
-+fi
- 
- 
- ##########################################################################
+ echo "$VALGRIND $xmlsec_app encrypt-tmpl $xmlsec_params --keys-file $keysfile --output $tmpfile" >> $logfile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xmlsec1.git