From 60cdc53c3954cafc16a1e0698328c12d3a3c1e83 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Sun, 20 Jun 2010 04:26:26 +0000
Subject: *** empty log message ***

---
 tests/GNUmakefile | 18 ++++++++----------
 tests/Makefile    |  2 --
 tests/SIZES.GC    | 28 ++++++++++++++--------------
 3 files changed, 22 insertions(+), 26 deletions(-)

(limited to 'tests')

diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index c431f2f..5d61a6f 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -52,7 +52,7 @@ MAKE	= make -k
 XXCFLAGS	= 
 XXLIBS	= -lws2_32 -lgomp
 #CFLAGS	= -O3 -UNDEBUG -Wall $(XXCFLAGS)
-CFLAGS	= -O3 -fopenmp -UNDEBUG -Wall $(XXCFLAGS)
+CFLAGS	= -O3 -UNDEBUG -Wall $(XXCFLAGS)
 BUILD_DIR	= ..
 INCLUDES	= -I.
 
@@ -167,13 +167,13 @@ all:
 	@ $(MAKE) clean GCE
 
 GC:
-	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" all-pass
+	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-fopenmp -D__CLEANUP_C" all-pass
 
 GCE:
-	$(MAKE) TEST=GCE CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" all-pass
+	$(MAKE) TEST=GCE CC=g++ XXCFLAGS="-fopenmp -mthreads -D__CLEANUP_CXX" all-pass
 
 GCX:
-	$(MAKE) TEST=GC CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_C" all-pass
+	$(MAKE) TEST=GC CC=g++ XXCFLAGS="-fopenmp -mthreads -D__CLEANUP_C" all-pass
 
 GC-bench:
 	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" XXLIBS="benchlib.o" all-bench
@@ -182,19 +182,19 @@ GCE-bench:
 	$(MAKE) TEST=GCE  CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" XXLIBS="benchlib." all-bench
 
 GC-debug:
-	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" DLL_VER="$(DLL_VER)d" all-pass
+	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-fopenmp -D__CLEANUP_C" DLL_VER="$(DLL_VER)d" all-pass
 
 GC-static:
-	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C -DPTW32_STATIC_LIB" DLL="" all-static
+	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C -DPTW32_STATIC_LIB" XXLIBS="-lws2_32" DLL="" all-static
 
 GC-stress:
 	$(ECHO) Stress tests can take a long time since they are trying to
 	$(ECHO) expose weaknesses that may be intermittant or statistically rare.
 	$(ECHO) A pass does not prove correctness, but may give greater confidence.
-	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" all-stress
+	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" XXLIBS="" all-stress
 
 GCE-stress:
-	$(MAKE) TEST=GCE  CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" all-stress
+	$(MAKE) TEST=GCE  CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" XXLIBS="" all-stress
 
 all-pass: $(PASSES)
 	@ $(ECHO) ALL TESTS PASSED! Congratulations!
@@ -207,8 +207,6 @@ all-stress: $(STRESSRESULTS)
 
 all-static: $(STATICRESULTS)
 	@ $(ECHO) ALL STATIC TESTS PASSED! Congratulations!
-	@ $(ECHO) Build and test the DLL to run all tests.
-	@ $(ECHO) This test only confirms that the static lib links correctly.
 
 benchtest1.bench:
 benchtest2.bench:
diff --git a/tests/Makefile b/tests/Makefile
index c3342be..70cec42 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -204,8 +204,6 @@ stresstests: $(CPLIB) $(CPDLL) $(CPHDR) $(STRESSRESULTS)
 
 statictests: $(CPLIB) $(CPDLL) $(CPHDR) $(STATICRESULTS)
 	@ $(ECHO) ALL STATIC TESTS DONE.
-	@ $(ECHO) Build and test the DLL to run all tests.
-	@ $(ECHO) The static test only confirms that the .lib links correctly.
 
 sizes.pass: sizes.exe
 	@ $(ECHO) ... Running $(TEST)$(DLL_VER) test: $*.exe
diff --git a/tests/SIZES.GC b/tests/SIZES.GC
index 9252581..603521b 100755
--- a/tests/SIZES.GC
+++ b/tests/SIZES.GC
@@ -1,21 +1,21 @@
-Sizes of pthreads-win32 structs
--------------------------------
+Sizes of pthreads-win32 structs
+-------------------------------
                      pthread_t    8
                 ptw32_thread_t  140
-               pthread_attr_t_   28
+               pthread_attr_t_   28
                         sem_t_   12
               pthread_mutex_t_   24
-          pthread_mutexattr_t_    8
-           pthread_spinlock_t_    8
+          pthread_mutexattr_t_    8
+           pthread_spinlock_t_    8
             pthread_barrier_t_   36
-        pthread_barrierattr_t_    4
-                pthread_key_t_   16
-               pthread_cond_t_   32
-           pthread_condattr_t_    4
-             pthread_rwlock_t_   28
-         pthread_rwlockattr_t_    4
+        pthread_barrierattr_t_    4
+                pthread_key_t_   16
+               pthread_cond_t_   32
+           pthread_condattr_t_    4
+             pthread_rwlock_t_   28
+         pthread_rwlockattr_t_    4
                pthread_once_t_   16
-               ptw32_cleanup_t   12
+               ptw32_cleanup_t   12
              ptw32_mcs_node_t_   16
-                   sched_param    4
--------------------------------
+                   sched_param    4
+-------------------------------
-- 
cgit v1.2.3