diff options
author | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
commit | 8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch) | |
tree | 158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/tests/exception2.c | |
parent | 4a165ef2f762a4ce9155f2a3626692326bda616d (diff) | |
parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
download | vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2 vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated to latest CVS version of pthreads
Conflicts:
pthreads/Makefile
Diffstat (limited to 'pthreads/tests/exception2.c')
-rw-r--r-- | pthreads/tests/exception2.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pthreads/tests/exception2.c b/pthreads/tests/exception2.c index faf677d9b..fffe2b558 100644 --- a/pthreads/tests/exception2.c +++ b/pthreads/tests/exception2.c @@ -6,10 +6,11 @@ * * Pthreads-win32 - POSIX Threads Library for Win32 * Copyright(C) 1998 John E. Bossom - * Copyright(C) 1999,2005 Pthreads-win32 contributors - * - * Contact Email: rpj@callisto.canberra.edu.au - * + * Copyright(C) 1999,2012 Pthreads-win32 contributors + * + * Homepage1: http://sourceware.org/pthreads-win32/ + * Homepage2: http://sourceforge.net/projects/pthreads4w/ + * * The current list of contributors is contained * in the file CONTRIBUTORS included with the source * code distribution. The list can also be seen at the @@ -125,10 +126,21 @@ main(int argc, char* argv[]) printf("You should see an \"abnormal termination\" message\n"); fflush(stdout); + result = system("exception2.exe die"); - exit(0); + + printf("\"exception2.exe die\" returned status %d\n", result); + + /* + * result should be 0, 1 or 3 depending on build settings + */ + exit((result == 0 || result == 1 || result == 3) ? 0 : 1); } +#if defined(NO_ERROR_DIALOGS) + SetErrorMode(SEM_NOGPFAULTERRORBOX); +#endif + assert((mt = pthread_self()).p != NULL); for (i = 0; i < NUMTHREADS; i++) @@ -136,7 +148,7 @@ main(int argc, char* argv[]) assert(pthread_create(&et[i], NULL, exceptionedThread, NULL) == 0); } - Sleep(1000); + Sleep(100); /* * Success. |