[hurd,commited] hurd: Fix XFAIL-ing mallocfork2 tests

Message ID 20211227212152.1549508-1-samuel.thibault@ens-lyon.org
State Committed, archived
Headers
Series [hurd,commited] hurd: Fix XFAIL-ing mallocfork2 tests |

Checks

Context Check Description
dj/TryBot-apply_patch fail Patch failed to apply to master at the time it was sent
dj/TryBot-32bit fail Patch series failed to apply

Commit Message

Samuel Thibault Dec. 27, 2021, 9:21 p.m. UTC
  They are using setpshared but are outside the htl directory.
---
 sysdeps/mach/hurd/i386/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
  

Patch

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