aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2024-05-31 10:04:54 -0500
committerEric Blake <eblake@redhat.com>2024-05-31 12:28:07 -0500
commitfc5cedfb8b1547cf9b498ec31c20b738fb382f67 (patch)
tree996019d4741de76f10d8557ddea668351b6d89a7
parent0e9490cebc726ef772b6c9e27dac32e7ae99f9b2 (diff)
downloadlibvirt-ci-fc5cedfb8b1547cf9b498ec31c20b738fb382f67.zip
libvirt-ci-fc5cedfb8b1547cf9b498ec31c20b738fb382f67.tar.gz
libvirt-ci-fc5cedfb8b1547cf9b498ec31c20b738fb382f67.tar.bz2
mappings: Add libc-malloc-debug for malloc perturbation
Enabling glibc malloc perturbation during CI is a cheap way to catch several malloc usage problems. This used to be easy (alter TESTS_ENVIRONMENT in Makefile.am to include MALLOC_CHECK_=1 and MALLOC_PERTURB_=$(random) for a proper setting of random), but has gotten progressively harder with newer glibc (you now have to LD_PRELOAD a specific library, and per https://issues.redhat.com/browse/RHEL-35971, Fedora 40 intentionally moved libc_malloc_debug.so.0 out of glibc into glibc-utils). As several lcitool clients (at least nbdkit and libnbd) want to use malloc debugging during CI, it is worth adding a new mapping for this purpose. Signed-off-by: Eric Blake <eblake@redhat.com>
-rw-r--r--lcitool/facts/mappings.yml6
-rw-r--r--tests/data/packages/in/packages.yml1
-rw-r--r--tests/data/packages/out/fedora-39.yml1
-rw-r--r--tests/data/packages/out/fedora-40.yml1
-rw-r--r--tests/data/packages/out/fedora-rawhide.yml1
5 files changed, 10 insertions, 0 deletions
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index e723dcf..967ec11 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -742,6 +742,12 @@ mappings:
cross-mingw64-rpm: mingw64-headers
cross-policy-default: foreign
+ libc-malloc-debug:
+ default:
+ Fedora: glibc-utils
+ Fedora39: glibc
+ cross-policy-default: foreign
+
libc-static:
apk: musl-dev
deb: libc6-dev
diff --git a/tests/data/packages/in/packages.yml b/tests/data/packages/in/packages.yml
index b77a364..c7a6c5a 100644
--- a/tests/data/packages/in/packages.yml
+++ b/tests/data/packages/in/packages.yml
@@ -103,6 +103,7 @@ packages:
- libblkid
- libbpf
- libc
+- libc-malloc-debug
- libc-static
- libcacard
- libcap-ng
diff --git a/tests/data/packages/out/fedora-39.yml b/tests/data/packages/out/fedora-39.yml
index 86db8d4..33f8359 100644
--- a/tests/data/packages/out/fedora-39.yml
+++ b/tests/data/packages/out/fedora-39.yml
@@ -60,6 +60,7 @@ native:
- git
- glib2-devel
- glib2-static
+- glibc
- glibc-devel
- glibc-langpack-en
- glibc-static
diff --git a/tests/data/packages/out/fedora-40.yml b/tests/data/packages/out/fedora-40.yml
index 86db8d4..c1b7370 100644
--- a/tests/data/packages/out/fedora-40.yml
+++ b/tests/data/packages/out/fedora-40.yml
@@ -63,6 +63,7 @@ native:
- glibc-devel
- glibc-langpack-en
- glibc-static
+- glibc-utils
- glusterfs-api-devel
- gnutls-devel
- gnutls-utils
diff --git a/tests/data/packages/out/fedora-rawhide.yml b/tests/data/packages/out/fedora-rawhide.yml
index c81c46f..030f9c0 100644
--- a/tests/data/packages/out/fedora-rawhide.yml
+++ b/tests/data/packages/out/fedora-rawhide.yml
@@ -63,6 +63,7 @@ native:
- glibc-devel
- glibc-langpack-en
- glibc-static
+- glibc-utils
- glusterfs-api-devel
- gnutls-devel
- gnutls-utils