diff options
author | Florian Weimer <fweimer@redhat.com> | 2017-01-25 16:27:03 +0100 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2017-01-25 16:27:03 +0100 |
commit | 5653ab12b4ae15b32d41de7c56b2a4626cd0437a (patch) | |
tree | 350790c67fb99f948ae69aa1af6bfd0bd8420059 /string/Makefile | |
parent | * soft-fp/op-common.h (_FP_MUL, _FP_FMA, _FP_DIV): Add (diff) | |
download | glibc-5653ab12b4ae15b32d41de7c56b2a4626cd0437a.tar.gz glibc-5653ab12b4ae15b32d41de7c56b2a4626cd0437a.tar.bz2 glibc-5653ab12b4ae15b32d41de7c56b2a4626cd0437a.zip |
string/tst-strcoll-overflow: Do not accept timeout as test result
The test completes within 300 seconds if enough memory is available.
Diffstat (limited to 'string/Makefile')
-rw-r--r-- | string/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/string/Makefile b/string/Makefile index 901c4d4d77..f317d02a8c 100644 --- a/string/Makefile +++ b/string/Makefile @@ -59,6 +59,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ tst-strtok_r bug-strcoll2 tst-cmp tst-xbzero-opt \ test-endian-types +# This test allocates a lot of memory and can run for a long time. xtests = tst-strcoll-overflow ifeq ($(run-built-tests),yes) @@ -94,7 +95,7 @@ $(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out LOCALES := de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \ tr_TR.ISO-8859-9 tr_TR.UTF-8 cs_CZ.UTF-8 \ - da_DK.ISO-8859-1 + da_DK.ISO-8859-1 en_GB.UTF-8 include ../gen-locales.mk $(objpfx)test-strcasecmp.out: $(gen-locales) @@ -103,5 +104,6 @@ $(objpfx)tst-strxfrm.out: $(gen-locales) $(objpfx)tst-strxfrm2.out: $(gen-locales) # bug-strcoll2 needs cs_CZ.UTF-8 and da_DK.ISO-8859-1. $(objpfx)bug-strcoll2.out: $(gen-locales) +$(objpfx)tst-strcoll-overflow.out: $(gen-locales) endif |