diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-05-04 08:31:16 +0200 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2011-05-04 08:31:16 +0200 |
| commit | 3004ce0c9619f89bf8e64931edd696bf4df8d2e1 (patch) | |
| tree | f03f898fa5c2506c4e30f5f89ce097acf01bc016 /test/nptl | |
| parent | 3b3285b1b7c02d36c74a6ae265fdb02ca991c96b (diff) | |
| parent | 4916fd889ec1c60710faa528a3ccdb50973198e2 (diff) | |
Merge remote-tracking branch 'origin/master' into prelink
* origin/master: (32 commits)
libubacktrace: fix backtrace support on arm-eabi, which needs libgcc_eh linked too
getaddrinfo.c: fix incorrect check for ERANGE from gethostbyaddr_r
getaddrinfo.c: improve code readability. No functional changes
string: remove unused variable
x86_64: silence warning if !TLS
buildsys: prettify ssp.c handling
madvise is LINUX_SPECIFIC
test_nptl: fix expected result for tst-cputimer[123]
test_nptl: fix expected result for tst-clock2 test
buildsys: make $(LOCAL_INSTALL_PATH) phony
ether_aton: reject invalid input
tests: disable ether tests if !HAS_SOCKET
inet: add ether_aton testcase
sysconf: clock_getres depends on HAS_REALTIME
__rt_sigwaitinfo: depends on HAS_REALTIME
buildsys: minor fixes in Makefile.arch for C6X
buildsys: minor fixes in Makefile.arch for microblaze
libubacktrace: enabled for all archs indeed.
sparc: don't access fp registers when configured for no fpu
libubacktrace: generic implementation based dwarf
...
Conflicts:
ldso/ldso/dl-elf.c
ldso/ldso/mips/elfinterp.c
ldso/ldso/x86_64/elfinterp.c
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'test/nptl')
| -rw-r--r-- | test/nptl/Makefile.in | 5 | ||||
| -rw-r--r-- | test/nptl/tst-clock2.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in index b6a279ebf..b91480250 100644 --- a/test/nptl/Makefile.in +++ b/test/nptl/Makefile.in @@ -221,9 +221,4 @@ OPTS_tst-cancel7 = --command ./tst-cancel7 OPTS_tst-mqueue7 = -- ./tst-mqueue7 OPTS_tst-exec4 = ./tst-exec4 -RET_tst-clock2 := 1 -RET_tst-cputimer1 := 1 -RET_tst-cputimer2 := 1 -RET_tst-cputimer3 := 1 - WRAPPER := env LD_LIBRARY_PATH="$$PWD:.:$(LD_LIBRARY_PATH)" TIMEOUTFACTOR=100 diff --git a/test/nptl/tst-clock2.c b/test/nptl/tst-clock2.c index 49a769bf4..bca40956e 100644 --- a/test/nptl/tst-clock2.c +++ b/test/nptl/tst-clock2.c @@ -62,7 +62,7 @@ do_test (void) if (sysconf (_SC_THREAD_CPUTIME) < 0) { puts ("_POSIX_THREAD_CPUTIME option not available"); - return 1; + return 0; } # endif |