summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2008-07-09 16:47:01 +0000
committerCarmelo Amoroso <carmelo.amoroso@st.com>2008-07-09 16:47:01 +0000
commit62a21af8006ab04282fdc354c5b4dc765f56d058 (patch)
tree568761d58289238aa14cced3f0010809d4d28c00 /test
parentef250238dc1572caf859c2b64652f9cdfb0d9e42 (diff)
downloaduClibc-alpine-62a21af8006ab04282fdc354c5b4dc765f56d058.tar.bz2
uClibc-alpine-62a21af8006ab04282fdc354c5b4dc765f56d058.tar.xz
BIG BIG commit: all left files merged from trunk [rev 22714]. Currenntly NPTL sh4 port build and work fine. All committed to allow Khem Ray working on a working branch to integrate the ARM nptl port. MIPS nptl port not tested but should still building and working fine. There are some other part non yet merged with trunk (misc/internals and some headers file that need some more work). Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'test')
-rw-r--r--test/locale/Makefile2
-rw-r--r--test/nptl/Makefile2
-rw-r--r--test/pthread/Makefile1
3 files changed, 3 insertions, 2 deletions
diff --git a/test/locale/Makefile b/test/locale/Makefile
index 328c84464..0ab07f7aa 100644
--- a/test/locale/Makefile
+++ b/test/locale/Makefile
@@ -12,7 +12,7 @@ TESTS := bug-iconv-trans bug-usesetlocale collate-test dump-ctype \
# NOTE: For now disabled some tests that are known not build
-TESTS_DISABLED := tst-ctype tst-fmon tst-leaks tst-rpmatch tst-strfmon1
+TESTS_DISABLED := tst-ctype tst-fmon tst-leaks tst-rpmatch tst-strfmon1
ifneq ($(UCLIBC_HAS_XLOCALE),y)
TESTS_DISABLED += bug-usesetlocale tst-xlocale1 tst-xlocale2 xfrm-test tst-C-locale
diff --git a/test/nptl/Makefile b/test/nptl/Makefile
index 605347f0d..65378dd87 100644
--- a/test/nptl/Makefile
+++ b/test/nptl/Makefile
@@ -146,4 +146,4 @@ RET_tst-cputimer1 := 1
RET_tst-cputimer2 := 1
RET_tst-cputimer3 := 1
-WRAPPER := env LD_LIBRARY_PATH="$$PWD:.:$(LD_LIBRARY_PATH)"
+WRAPPER := env LD_LIBRARY_PATH="$$PWD:.:$(LD_LIBRARY_PATH)" TIMEOUTFACTOR=100
diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index ef924ad1a..622cbe0fa 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -1,6 +1,7 @@
# uClibc pthread tests
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+TESTS_DISABLED += cancellation-points
include ../Test.mak
EXTRA_LDFLAGS := -lpthread