[Pkg-swan-devel] [strongswan] 02/03: Add patch to fix testsuite failure on armel

[Yves-Alexis Perez]

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

corsac pushed a commit to branch master
in repository strongswan.

commit 53b649bca6d8d323d2b64f4e2357497acb978910
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Wed Apr 2 21:20:31 2014 +0200

    Add patch to fix testsuite failure on armel
---
 debian/changelog                                      |  4 +++-
 .../patches/03_unit-tests-Fix-chunk-clear-armel.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 51212ba..01e58a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 strongswan (5.1.2-3) UNRELEASED; urgency=medium
 
   * debian/patches/
-    02_unit-tests-Fix-filtered-enumerator-tests-on-64-bit-b.patch added, fix
+    - 02_unit-tests-Fix-filtered-enumerator-tests-on-64-bit-b  added, fix
     testsuite failing on 64 bit big-endian platforms (s390x).
+    - 03_unit-tests-Fix-chunk-clear-armel added, fix testsuite failing on
+    armel.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 27 Mar 2014 20:52:10 +0100
 
diff --git a/debian/patches/03_unit-tests-Fix-chunk-clear-armel.patch b/debian/patches/03_unit-tests-Fix-chunk-clear-armel.patch
new file mode 100644
index 0000000..eb92fac
--- /dev/null
+++ b/debian/patches/03_unit-tests-Fix-chunk-clear-armel.patch
@@ -0,0 +1,19 @@
+--- a/src/libstrongswan/tests/suites/test_chunk.c
++++ b/src/libstrongswan/tests/suites/test_chunk.c
+@@ -117,10 +117,13 @@ START_TEST(test_chunk_clear)
+ 	}
+ 	chunk_clear(&chunk);
+ 	/* check memory area of freed chunk. We can't use ck_assert() for this
+-	 * test directly, as it might allocate data at the freed area. */
+-	for (i = 0; i < 64; i++)
++	 * test directly, as it might allocate data at the freed area.  comparing
++	 * two bytes at once reduces the chances of conflicts if memory got
++	 * overwritten already */
++	for (i = 0; i < 64; i += 2)
+ 	{
+-		if (ptr[i] != 0 && ptr[i] == i)
++		if (ptr[i] != 0 && ptr[i] == i &&
++			ptr[i+1] != 0 && ptr[i+1] == i+1)
+ 		{
+ 			cleared = FALSE;
+ 			break;
diff --git a/debian/patches/series b/debian/patches/series
index 06fa1b5..d31e3c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix-manpages.patch
 02_unit-tests-Fix-filtered-enumerator-tests-on-64-bit-b.patch
+03_unit-tests-Fix-chunk-clear-armel.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git