[glibc] 01/01: Use testsuite-xfail-debian.mk's tests-unsupported instead of patching the test
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.23
in repository glibc.
commit d29a6823f8a7b9c539e071879585dbea16d0b32e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Mar 17 11:03:13 2016 +0100
Use testsuite-xfail-debian.mk's tests-unsupported instead of patching the test
---
debian/changelog | 2 +-
debian/patches/hurd-i386/local-test-skip.diff | 17 -----------------
debian/patches/series.hurd-i386 | 1 -
debian/testsuite-xfail-debian.mk | 3 +++
4 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4f1b135..aced215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
* hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
* hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
* hurd-i386/unsubmitted-libpthread.so.diff: Fix building malloc tests.
- * hurd-i386/local-test-skip.diff: Skip test which just overflows memory.
+ * testsuite-xfail-debian.mk: Skip test which just overflows memory.
-- Aurelien Jarno <aurel32@debian.org> Mon, 14 Mar 2016 00:14:11 +0100
diff --git a/debian/patches/hurd-i386/local-test-skip.diff b/debian/patches/hurd-i386/local-test-skip.diff
deleted file mode 100644
index ee61dc8..0000000
--- a/debian/patches/hurd-i386/local-test-skip.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-RLIMIT_AS is not supported yet. Running this test would thus just overflow
-memory.
-
-Index: glibc-2.23/malloc/tst-malloc-thread-fail.c
-===================================================================
---- glibc-2.23.orig/malloc/tst-malloc-thread-fail.c
-+++ glibc-2.23/malloc/tst-malloc-thread-fail.c
-@@ -309,6 +309,9 @@ run_allocation_functions (void)
- int
- do_test (void)
- {
-+ puts("RLIMIT_AS not supported, test skipped");
-+ return 0;
-+
- /* Limit the number of malloc arenas. We use a very low number so
- that despute the address space limit configured below, all
- requested arenas a can be created. */
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index 0f04acd..b7cb1b0 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -13,4 +13,3 @@ hurd-i386/local-no-bootstrap-fs-access.diff
hurd-i386/unsubmitted-timer_routines.diff
hurd-i386/local-versions-hack.diff
hurd-i386/unsubmitted-libpthread.so.diff
-hurd-i386/local-test-skip.diff
diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk
index 91a3ea4..5d23160 100644
--- a/debian/testsuite-xfail-debian.mk
+++ b/debian/testsuite-xfail-debian.mk
@@ -197,6 +197,9 @@ tests-unsupported += tst-timer4
tests-unsupported += tst-timer5
tests-unsupported += tst-malloc-backtrace
+# bounding memory allocation is not supported yet
+tests-unsupported += tst-malloc-thread-fail
+
# Need actual porting
test-xfail-exe = yes
test-xfail-tst-mqueue5 = yes
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: