From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 27 Dec 2021 21:21:08 +0000 (+0100)
Subject: hurd: Fix XFAIL-ing mallocfork2 tests
X-Git-Tag: glibc-2.35~201
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=7b358de1af5473217fa1cee3838997add91c8311;p=glibc.git

hurd: Fix XFAIL-ing mallocfork2 tests

They are using setpshared but are outside the htl directory.
---

diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index 2036aad4cc..f725114619 100644
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -103,9 +103,16 @@ ifeq ($(subdir),mach)
 test-xfail-check-abi-libmachuser = yes
 endif
 
-ifeq ($(subdir),htl)
 # For bug 25521
 # (setpshared support)
+ifeq ($(subdir),malloc)
+test-xfail-tst-mallocfork2 = yes
+test-xfail-tst-mallocfork2-mcheck = yes
+test-xfail-tst-mallocfork2-malloc-check = yes
+test-xfail-tst-mallocfork2-malloc-hugetlb1 = yes
+test-xfail-tst-mallocfork2-malloc-hugetlb2 = yes
+endif
+ifeq ($(subdir),htl)
 test-xfail-tst-mutex4 = yes
 test-xfail-tst-cancel16 = yes
 test-xfail-tst-cancelx16 = yes
@@ -119,13 +126,12 @@ test-xfail-tst-rwlock12 = yes
 test-xfail-tst-barrier2 = yes
 test-xfail-tst-pututxline-cache = yes
 test-xfail-tst-pututxline-lockfail = yes
-test-xfail-tst-mallocfork2 = yes
-test-xfail-tst-mallocfork2-malloc-hugetlb1 = yes
-test-xfail-tst-mallocfork2-malloc-hugetlb2 = yes
 test-xfail-tst-flock2 = yes
 test-xfail-tst-signal1 = yes
 test-xfail-tst-signal2 = yes
+endif
 
+ifeq ($(subdir),htl)
 # For bug 25522
 # (setprotocol support)
 test-xfail-tst-cond24 = yes