diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/Makefile | 3 | ||||
| -rw-r--r-- | tests/join1.c | 5 | ||||
| -rw-r--r-- | tests/join2.c | 37 |
4 files changed, 48 insertions, 1 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index ac229c7..3d5163b 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Aug 19 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au> + + * join2.c: New test. + Wed Aug 12 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au> * Makefile (LIBS): Add -L. diff --git a/tests/Makefile b/tests/Makefile index 7c60452..60bd014 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -38,7 +38,7 @@ COPYFILES = $(HDR) $(LIB) $(DLL) TESTS = mutex1 condvar1 condvar2 exit1 create1 equal1 \ exit2 exit3 \ - join1 mutex2 mutex3 \ + join1 join2 mutex2 mutex3 \ count1 once1 tsd1 self1 self2 eyal1 \ condvar3 condvar4 condvar5 condvar6 \ errno1 @@ -60,6 +60,7 @@ equal1.pass: create1.pass exit2.pass: create1.pass exit3.pass: create1.pass join1.pass: create1.pass +join2.pass: create1.pass count1.pass: join1.pass once1.pass: create1.pass tsd1.pass: join1.pass diff --git a/tests/join1.c b/tests/join1.c index f6240de..f206c0b 100644 --- a/tests/join1.c +++ b/tests/join1.c @@ -33,7 +33,12 @@ main(int argc, char * argv[]) for (i = 0; i < 4; i++) { assert(pthread_join(id[i], (void *) &result) == 0); +#if ! defined (__MINGW32__) || defined (__MSVCRT__) assert(result == i); +#else +# warning pthread_join not fully supported in this configuration. + assert(result == 0); +#endif } /* Success. */ diff --git a/tests/join2.c b/tests/join2.c new file mode 100644 index 0000000..281a0df --- /dev/null +++ b/tests/join2.c @@ -0,0 +1,37 @@ +/* + * Test for pthread_join() returning return value from threads. + * + * Depends on API functions: pthread_create(). + */ + +#include "test.h" + +void * +func(void * arg) +{ + Sleep(1000); + return arg; +} + +int +main(int argc, char * argv[]) +{ + pthread_t id[4]; + int i; + int result; + + /* Create a few threads and then exit. */ + for (i = 0; i < 4; i++) + { + assert(pthread_create(&id[i], NULL, func, (void *) i) == 0); + } + + for (i = 0; i < 4; i++) + { + assert(pthread_join(id[i], (void *) &result) == 0); + assert(result == i); + } + + /* Success. */ + return 0; +} |