[Pkg-libvirt-commits] [libvirt] 01/02: test: qemuxml2argv: Mock virMemoryMaxValue to remove 32/64 bit difference

[Guido Guenther]

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

agx pushed a commit to annotated tag debian/1.3.0-2
in repository libvirt.

commit e89c059308d8b25aa7c95f1f46cefc779e446d46
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jan 5 20:53:37 2016 +0100

    test: qemuxml2argv: Mock virMemoryMaxValue to remove 32/64 bit difference
    
    to fix the testsuite on i386
---
 debian/patches/series                              |  1 +
 ...v-Mock-virMemoryMaxValue-to-remove-32-64-.patch | 48 ++++++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index f3143d1..5b15831 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 CVE-2015-5313-storage-don-t-allow-in-filesystem-volume-na.patch
+test-qemuxml2argv-Mock-virMemoryMaxValue-to-remove-32-64-.patch
diff --git a/debian/patches/test-qemuxml2argv-Mock-virMemoryMaxValue-to-remove-32-64-.patch b/debian/patches/test-qemuxml2argv-Mock-virMemoryMaxValue-to-remove-32-64-.patch
new file mode 100644
index 0000000..6370526
--- /dev/null
+++ b/debian/patches/test-qemuxml2argv-Mock-virMemoryMaxValue-to-remove-32-64-.patch
@@ -0,0 +1,48 @@
+From: Peter Krempa <pkrempa at redhat.com>
+Date: Thu, 10 Dec 2015 14:36:51 +0100
+Subject: test: qemuxml2argv: Mock virMemoryMaxValue to remove 32/64 bit
+ difference
+
+Always return LLONG_MAX even on 32 bit systems. The limitation
+originates from our use of "unsigned long" in several APIs. The internal
+data type is unsigned long long. Make the test suite deterministic by
+removing the architecture difference.
+
+Flaw was introduced in 645881139b3d2c86acf9d644c3a1471520bc9e57 where
+I've added a test that uses too large numbers.
+---
+ src/util/virutil.c       |  2 ++
+ tests/qemuxml2argvmock.c | 10 ++++++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/util/virutil.c b/src/util/virutil.c
+index d8e83ef..8f83dcf 100644
+--- a/src/util/virutil.c
++++ b/src/util/virutil.c
+@@ -2639,6 +2639,8 @@ virMemoryLimitIsSet(unsigned long long value)
+  * @capped: whether the value must fit into unsigned long
+  *   (long long is assumed otherwise)
+  *
++ * Note: This function is mocked in tests/qemuxml2argvmock.c for test stability
++ *
+  * Returns the maximum possible memory value in bytes.
+  */
+ unsigned long long
+diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
+index e58b8ce..8426108 100644
+--- a/tests/qemuxml2argvmock.c
++++ b/tests/qemuxml2argvmock.c
+@@ -74,3 +74,13 @@ virTPMCreateCancelPath(const char *devpath)
+ 
+     return path;
+ }
++
++/**
++ * Large values for memory would fail on 32 bit systems, despite having
++ * variables that support it.
++ */
++unsigned long long
++virMemoryMaxValue(bool capped ATTRIBUTE_UNUSED)
++{
++    return LLONG_MAX;
++}

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