From cbf5d947fd23816781cf904ab2c269cb62f9c851 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mar 16 2021 04:19:34 +0000 Subject: test-cpu-set-util: fix allocation size check on i386 We get just 28 bytes not 32 as on 64-bit architectures (__cpu_set_t is 4 bytes, we need at least 26, so 28 satisfies the constraints). (cherry picked from commit 64412970ac0d4b6f5c4bbd8816edc9bff9eab2de) Related: #1734787 patch_name: 0295-test-cpu-set-util-fix-allocation-size-check-on-i386.patch present_in_specfile: true location_in_specfile: 295 squash_commits: true --- diff --git a/src/test/test-cpu-set-util.c b/src/test/test-cpu-set-util.c index 3456add..136eaca 100644 --- a/src/test/test-cpu-set-util.c +++ b/src/test/test-cpu-set-util.c @@ -256,7 +256,9 @@ static void test_cpu_set_to_from_dbus(void) { assert_se(array); assert_se(allocated == c.allocated); - assert(memcmp(array, expected, sizeof expected) == 0); + assert_se(allocated <= sizeof expected); + assert_se(allocated >= DIV_ROUND_UP(201u, 8u)); /* We need at least 201 bits for our mask */ + assert(memcmp(array, expected, allocated) == 0); assert_se(cpu_set_from_dbus(array, allocated, &c2) == 0); assert_se(c2.set);