From 8200f6ff1edca15756a22e6359f20836c4b5425b Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Wed, 27 Feb 2002 22:53:15 +0000
Subject:         * exception3.c (terminateFunction): For MSVC++, call        
 exit() rather than pthread_exit(). Add comments to explain         why.

        * rwlock2_t.c: New test.
        * rwlock3_t.c: New test.
        * rwlock4_t.c: New test.
        * rwlock5_t.c: New test.
        * rwlock6_t.c: New test.
        * rwlock6_t2.c: New test.
        * rwlock6.c (main): Swap thread and result variables
        to correspond to actual thread functions.
        * rwlock1.c: Change test description comment to correspond
        to the actual test.
---
 tests/Makefile | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'tests/Makefile')

diff --git a/tests/Makefile b/tests/Makefile
index 9532b41..00e886f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -40,7 +40,7 @@ ECHO	= @echo
 
 CPHDR	= pthread.h semaphore.h sched.h
 
-OPTIM	= /O2
+OPTIM	= /O2 /Ob0
 
 # C++ Exceptions
 VCEFLAGS	= /GX /TP /DPtW32NoCatchWarn /D__CLEANUP_CXX
@@ -89,6 +89,7 @@ PASSES= loadfree.pass \
 	  condvar7.pass  condvar8.pass  condvar9.pass  \
 	  errno1.pass  \
 	  rwlock1.pass  rwlock2.pass  rwlock3.pass  rwlock4.pass  rwlock5.pass  rwlock6.pass  rwlock7.pass  \
+	  rwlock2_t.pass  rwlock3_t.pass  rwlock4_t.pass  rwlock5_t.pass  rwlock6_t.pass  rwlock6_t2.pass  \
 	  context1.pass  \
 	  cancel3.pass  cancel4.pass  cancel5.pass  cancel6a.pass  cancel6d.pass  \
 	  cleanup0.pass  cleanup1.pass  cleanup2.pass  cleanup3.pass  \
@@ -101,22 +102,22 @@ PASSES= loadfree.pass \
 BENCHRESULTS = \
 	  benchtest1.bench benchtest2.bench benchtest3.bench benchtest4.bench benchtest5.bench
 
-all:
+help:
 	@ $(ECHO) Run one of the following command lines:
-	@ $(ECHO) nmake clean VCE   (to test using the VCE dll with VC++ EH applications)
-	@ $(ECHO) nmake clean VSE   (to test using VSE dll with VC (SEH) applications)
 	@ $(ECHO) nmake clean VC    (to test using VC dll with VC (no EH) applications)
 	@ $(ECHO) nmake clean VCX   (to test using VC dll with VC++ (EH) applications)
-	@ $(ECHO) nmake clean VCE-bench   (to benchtest using VCE dll with C++ bench app)
-	@ $(ECHO) nmake clean VSE-bench   (to benchtest using VSE dll with SEH bench app)
+	@ $(ECHO) nmake clean VCE   (to test using the VCE dll with VC++ EH applications)
+	@ $(ECHO) nmake clean VSE   (to test using VSE dll with VC (SEH) applications)
 	@ $(ECHO) nmake clean VC-bench    (to benchtest using VC dll with C bench app)
 	@ $(ECHO) nmake clean VCX-bench   (to benchtest using VC dll with C++ bench app)
+	@ $(ECHO) nmake clean VCE-bench   (to benchtest using VCE dll with C++ bench app)
+	@ $(ECHO) nmake clean VSE-bench   (to benchtest using VSE dll with SEH bench app)
 
-auto:
-	@ nmake clean VCE
-	@ nmake clean VSE
+all:
 	@ nmake clean VC
 	@ nmake clean VCX
+	@ nmake clean VCE
+	@ nmake clean VSE
 	@ nmake clean VC-bench
 
 tests: $(CPLIB) $(CPDLL) $(CPHDR) $(PASSES)
@@ -190,6 +191,7 @@ clean:
 	- $(RM) *.exe
 	- $(RM) *.pass
 	- $(RM) *.bench
+	- $(RM) *.log
 
 benchtest1.bench:
 benchtest2.bench:
@@ -277,6 +279,12 @@ rwlock4.pass: rwlock3.pass
 rwlock5.pass: rwlock4.pass
 rwlock6.pass: rwlock5.pass
 rwlock7.pass: rwlock6.pass
+rwlock2_t.pass: rwlock2.pass
+rwlock3_t.pass: rwlock2_t.pass
+rwlock4_t.pass: rwlock3_t.pass
+rwlock5_t.pass: rwlock4_t.pass
+rwlock6_t.pass: rwlock5_t.pass
+rwlock6_t2.pass: rwlock6_t.pass
 self1.pass:
 self2.pass: create1.pass
 spin1.pass:
-- 
cgit v1.2.3