mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-18 06:31:15 +00:00
jemalloc: skip extent test with profiling enabled (#540203)
This commit is contained in:
@@ -51,6 +51,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# `rtree_read.constprop.0` shows up in some builds but
|
||||
# not others, so we fall back to O2:
|
||||
./o3-to-o2.patch
|
||||
|
||||
# Active profiling may make xallocx decline to grow non-page-aligned
|
||||
# allocations, so test/integration/extent can observe decommit without
|
||||
# the matching commit on platforms with real decommit/commit.
|
||||
#
|
||||
# A (longer) patch addressing the failure posted upstream at:
|
||||
# https://github.com/jemalloc/jemalloc/pull/2954
|
||||
./skip-extent-test-with-prof-active.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
diff --git a/test/integration/extent.sh b/test/integration/extent.sh
|
||||
index 39fb0a73..ee9f3ed4 100644
|
||||
--- a/test/integration/extent.sh
|
||||
+++ b/test/integration/extent.sh
|
||||
@@ -1,5 +1,19 @@
|
||||
#!/bin/sh
|
||||
|
||||
+# With active profiling, xallocx may decline to grow non-page-aligned
|
||||
+# allocations. On platforms with real decommit/commit, this can make this
|
||||
+# test observe a successful decommit without the matching commit.
|
||||
+case ",${MALLOC_CONF_ALL}," in
|
||||
+ *,prof:true,*)
|
||||
+ case ",${MALLOC_CONF_ALL}," in
|
||||
+ *,prof_active:false,*)
|
||||
+ ;;
|
||||
+ *)
|
||||
+ return 1
|
||||
+ ;;
|
||||
+ esac
|
||||
+esac
|
||||
+
|
||||
if [ "x${enable_fill}" = "x1" ] ; then
|
||||
export MALLOC_CONF="junk:false"
|
||||
fi
|
||||
Reference in New Issue
Block a user