From 0116788efd1a5e2e815514690a732290bb9b52fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Tue, 25 Feb 2020 19:04:33 +0100 Subject: [PATCH] Add patch for timeouts on PPC64 --- 0002-test-Fix-obj_zones-for-ppc64le.patch | 38 +++++++++++++++++++++++ nvml.spec | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 0002-test-Fix-obj_zones-for-ppc64le.patch diff --git a/0002-test-Fix-obj_zones-for-ppc64le.patch b/0002-test-Fix-obj_zones-for-ppc64le.patch new file mode 100644 index 0000000..19f4d54 --- /dev/null +++ b/0002-test-Fix-obj_zones-for-ppc64le.patch @@ -0,0 +1,38 @@ +From 0d72150d0f1e6d52c3b8888500fbcce64c751362 Mon Sep 17 00:00:00 2001 +From: "Lucas A. M. Magalhaes" +Date: Fri, 21 Feb 2020 09:40:28 -0300 +Subject: [PATCH] test: Fix obj_zones for ppc64le + +This test was timing out because of intensive page_fault +handling. By allocating more by each loop we minimize this +issue. + +Signed-off-by: Lucas A. M. Magalhaes +--- + src/test/obj_zones/obj_zones.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/test/obj_zones/obj_zones.c b/src/test/obj_zones/obj_zones.c +index c1d84268a..3cc796beb 100644 +--- a/src/test/obj_zones/obj_zones.c ++++ b/src/test/obj_zones/obj_zones.c +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + #include "unittest.h" + +@@ -104,7 +105,7 @@ test_malloc_free(const char *path) + 0, S_IWUSR | S_IRUSR)) == NULL) + UT_FATAL("!pmemobj_create: %s", path); + +- size_t alloc_size = 128 * 1024; ++ size_t alloc_size = PMEM_PAGESIZE * 32; + size_t max_allocs = 1000000; + PMEMoid *oid = MALLOC(sizeof(PMEMoid) * max_allocs); + size_t n = 0; +-- +2.20.1 + diff --git a/nvml.spec b/nvml.spec index 6d988dc..79cba1b 100644 --- a/nvml.spec +++ b/nvml.spec @@ -39,6 +39,7 @@ URL: http://pmem.io/pmdk Source0: https://github.com/pmem/pmdk/releases/download/%{upstreamversion}/pmdk-%{upstreamversion}.tar.gz Patch0: 0001-test-py-add-require_free_space.patch +Patch1: 0002-test-Fix-obj_zones-for-ppc64le.patch BuildRequires: gcc BuildRequires: make @@ -528,6 +529,7 @@ provided in the command line options to check whether files are in a consistent %prep %setup -q -n pmdk-%{upstreamversion} %patch0 -p1 +%patch1 -p1 %build