diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-11-06 13:25:51 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-11-06 13:25:51 +0100 |
| commit | 89e3a41b0b96c1eff9caf5c2e8df56b11cdbd1f2 (patch) | |
| tree | c2297cf6314039618320d26d2a9f5d55e4c575c9 /libpthread/tests | |
| parent | 99a76fa75feff819f58dc923cfc0e6d815dd1829 (diff) | |
| parent | 8f34bd6d8695f68dfaeeb7a72c812db67aa90bbf (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'libpthread/tests')
| -rw-r--r-- | libpthread/tests/Makefile | 2 | ||||
| -rw-r--r-- | libpthread/tests/test-7.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libpthread/tests/Makefile b/libpthread/tests/Makefile index 9509c957..5ebc01d3 100644 --- a/libpthread/tests/Makefile +++ b/libpthread/tests/Makefile @@ -4,7 +4,7 @@ LDLIBS = -lpthread CHECK_SRC := test-1.c test-2.c test-3.c test-6.c test-7.c test-8.c \ test-9.c test-10.c test-11.c test-12.c test-13.c test-14.c \ - test-15.c test-16.c + test-15.c test-16.c test-17.c test-__pthread_destroy_specific-skip.c CHECK_OBJS := $(addsuffix .o,$(basename $(notdir $(CHECK_SRC)))) CHECK_PROGS := $(basename $(notdir $(CHECK_SRC))) \ diff --git a/libpthread/tests/test-7.c b/libpthread/tests/test-7.c index 8159be34..22fb1caa 100644 --- a/libpthread/tests/test-7.c +++ b/libpthread/tests/test-7.c @@ -42,6 +42,9 @@ main (int argc, char **argv) assert ((pthread_t) val == pthread_self ()); } + assert (pthread_getspecific ((pthread_key_t) 0) == NULL); + assert (pthread_setspecific ((pthread_key_t) 0, (void *) 0x1) == EINVAL); + for (i = 0; i < KEYS; i ++) err = pthread_key_create (&key[i], des); |