aboutsummaryrefslogtreecommitdiff
path: root/pthreads/tests/exception2.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-02-13 10:41:10 +0100
committermarha <marha@users.sourceforge.net>2013-02-13 10:41:10 +0100
commitb41f74438672dd682bc01ae818cb3da654f22c1e (patch)
tree07674ef1368a5427a75080528d8cee74234f6b28 /pthreads/tests/exception2.c
parentaaf21968deb85b635cb6aa6544df233ea5981346 (diff)
downloadvcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.tar.gz
vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.tar.bz2
vcxsrv-b41f74438672dd682bc01ae818cb3da654f22c1e.zip
Updated to latest CVS version of pthreads
Diffstat (limited to 'pthreads/tests/exception2.c')
-rw-r--r--pthreads/tests/exception2.c24
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.