diff options
| author | rpj <rpj> | 2011-05-30 00:30:56 +0000 |
|---|---|---|
| committer | rpj <rpj> | 2011-05-30 00:30:56 +0000 |
| commit | 26ed1ebeb95caec8d733a6a91e71e31312a8eb06 (patch) | |
| tree | a957bdd3826088a9e447fc830ac4ccf835b77c44 /tests | |
| parent | 2fe8aba6a8a4ce09f353f34881c77f93a9c01ca3 (diff) | |
Compiler directive cleanups
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/GNUmakefile | 3 | ||||
| -rwxr-xr-x | tests/SIZES.GCE | 6 | ||||
| -rw-r--r-- | tests/SIZES.VCE | 6 | ||||
| -rw-r--r-- | tests/cancel2.c | 2 | ||||
| -rw-r--r-- | tests/reuse2.c | 3 |
6 files changed, 16 insertions, 8 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index f5d8d08..843837f 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2011-05-11 Ross Johnson <ross.johnson at homemail.com.au> + + * GNUmakefile (GCE-debug): New target; expects pthreadGCE2d.dll. + 2011-05-05 Ross Johnson <ross.johnson at homemail.com.au> * openmp1.c: Add missing test; used to comfirm that this diff --git a/tests/GNUmakefile b/tests/GNUmakefile index 9a46b2c..e0e9de5 100644 --- a/tests/GNUmakefile +++ b/tests/GNUmakefile @@ -204,6 +204,9 @@ GCE-bench: GC-debug: $(MAKE) TEST=GC CC=$(CC) XXCFLAGS="-fopenmp -D__CLEANUP_C" OPT="${DOPT}" DLL_VER="$(DLL_VER)d" all-pass +GCE-debug: + $(MAKE) TEST=GCE CC=$(CXX) XXCFLAGS="-fopenmp -D__CLEANUP_CXX" OPT="${DOPT}" DLL_VER="$(DLL_VER)d" all-pass + GC-bench-debug: $(MAKE) TEST=GC CC=$(CC) XXCFLAGS="-D__CLEANUP_C" XXLIBS="benchlib.o" OPT="${OPT}" DLL_VER="$(DLL_VER)d" all-bench diff --git a/tests/SIZES.GCE b/tests/SIZES.GCE index 7048d3a..709114d 100755 --- a/tests/SIZES.GCE +++ b/tests/SIZES.GCE @@ -1,11 +1,11 @@ Sizes of pthreads-win32 structs
-------------------------------
pthread_t 8
- ptw32_thread_t 76
+ ptw32_thread_t 96
pthread_attr_t_ 28
sem_t_ 12
- pthread_mutex_t_ 24
- pthread_mutexattr_t_ 8
+ pthread_mutex_t_ 28
+ pthread_mutexattr_t_ 12
pthread_spinlock_t_ 8
pthread_barrier_t_ 36
pthread_barrierattr_t_ 4
diff --git a/tests/SIZES.VCE b/tests/SIZES.VCE index 7048d3a..709114d 100644 --- a/tests/SIZES.VCE +++ b/tests/SIZES.VCE @@ -1,11 +1,11 @@ Sizes of pthreads-win32 structs
-------------------------------
pthread_t 8
- ptw32_thread_t 76
+ ptw32_thread_t 96
pthread_attr_t_ 28
sem_t_ 12
- pthread_mutex_t_ 24
- pthread_mutexattr_t_ 8
+ pthread_mutex_t_ 28
+ pthread_mutexattr_t_ 12
pthread_spinlock_t_ 8
pthread_barrier_t_ 36
pthread_barrierattr_t_ 4
diff --git a/tests/cancel2.c b/tests/cancel2.c index d7c7f86..83cb6eb 100644 --- a/tests/cancel2.c +++ b/tests/cancel2.c @@ -80,7 +80,7 @@ * Create NUMTHREADS threads in addition to the Main thread. */ enum { - NUMTHREADS = 1 + NUMTHREADS = 4 }; typedef struct bag_t_ bag_t; diff --git a/tests/reuse2.c b/tests/reuse2.c index c4db811..362e547 100644 --- a/tests/reuse2.c +++ b/tests/reuse2.c @@ -111,7 +111,8 @@ main() for (i = 0; i < NUMTHREADS; i++) { - assert(pthread_create(&t[i], &attr, func, NULL) == 0); + while(pthread_create(&t[i], &attr, func, NULL) != 0) + Sleep(1); } while (NUMTHREADS > InterlockedExchangeAdd((LPLONG)&done, 0L)) |