See the ChanegLog

8 files changed, 17 insertions, 15 deletions

diff --git a/tests/Bmakefile b/tests/Bmakefile
index d115d44..df2ac1b 100644
--- a/tests/Bmakefile
+++ b/tests/Bmakefile
@@ -258,7 +258,7 @@ condvar6.pass: condvar5.pass
 condvar7.pass: condvar6.pass cleanup1.pass
 condvar8.pass: condvar7.pass
 condvar9.pass: condvar8.pass
-context1.pass: cancel2.pass
+context1.pass: cancel1.pass
 count1.pass: join1.pass
 create1.pass: mutex2.pass
 create2.pass: create1.pass
diff --git a/tests/ChangeLog b/tests/ChangeLog
index c4120ea..dfb4f45 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -5,6 +5,8 @@
 	* cancel2.c: Ensure this test only runs for Structured or C++ EH.
 	* exit2.c: Shorten Sleep() time.
 	* exit3.c: Likewise.
+	* cancel1.c: Likewise.
+	* cancel3.c: Likewise.
 	* exception3.c: Likewise; make terminate routine consistent for all
 	build environments.
 
diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index 1744255..355c27e 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -251,7 +251,6 @@ barrier5.pass: barrier4.pass
 barrier6.pass: barrier5.pass
 cancel1.pass: create1.pass
 cancel2.pass: cancel1.pass
-cancel2_1.pass: cancel2.pass
 cancel3.pass: context1.pass
 cancel4.pass: cancel3.pass
 cancel5.pass: cancel3.pass
@@ -279,11 +278,11 @@ condvar6.pass: condvar5.pass
 condvar7.pass: condvar6.pass cleanup1.pass
 condvar8.pass: condvar7.pass
 condvar9.pass: condvar8.pass
-context1.pass: cancel2.pass
+context1.pass: cancel1.pass
 count1.pass: join1.pass
 create1.pass: mutex2.pass
 create2.pass: create1.pass
-delay1.pass: cancel2.pass
+delay1.pass:
 delay2.pass: delay1.pass
 detach1.pass: join0.pass
 equal1.pass: create1.pass
diff --git a/tests/Makefile b/tests/Makefile
index 04a601c..831eaa9 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -349,7 +349,7 @@ condvar6.pass: condvar5.pass
 condvar7.pass: condvar6.pass cleanup1.pass
 condvar8.pass: condvar7.pass
 condvar9.pass: condvar8.pass
-context1.pass: cancel2.pass
+context1.pass: cancel1.pass
 count1.pass: join1.pass
 create1.pass: mutex2.pass
 create2.pass: create1.pass
diff --git a/tests/Wmakefile b/tests/Wmakefile
index b199df4..2b37c46 100644
--- a/tests/Wmakefile
+++ b/tests/Wmakefile
@@ -256,7 +256,7 @@ condvar6.pass: condvar5.pass
 condvar7.pass: condvar6.pass cleanup1.pass
 condvar8.pass: condvar7.pass
 condvar9.pass: condvar8.pass
-context1.pass: cancel2.pass
+context1.pass: cancel1.pass
 count1.pass: join1.pass
 create1.pass: mutex2.pass
 create2.pass: create1.pass
diff --git a/tests/cancel1.c b/tests/cancel1.c
index be9b102..23d2726 100644
--- a/tests/cancel1.c
+++ b/tests/cancel1.c
@@ -145,7 +145,7 @@ main()
   /*
    * Give threads time to run.
    */
-  Sleep(NUMTHREADS * 1000);
+  Sleep(NUMTHREADS * 100);
 
   /*
    * Standard check that all threads started.
diff --git a/tests/cancel2.c b/tests/cancel2.c
index 0eff4a0..2ee596a 100644
--- a/tests/cancel2.c
+++ b/tests/cancel2.c
@@ -73,9 +73,9 @@
  */
 
 /*
- * EXCEPTION_CONTINUE_SEARCH is used to identify that we are using SEH
+ * Don't know how to identify if we are using SEH so it's only C++ for now
  */
-#if defined(EXCEPTION_CONTINUE_SEARCH) || defined(__cplusplus)
+#if defined(__cplusplus)
 
 #include "test.h"
 
@@ -123,7 +123,7 @@ mythread(void * arg)
       break;
     }
 
-#if defined(_MSC_VER) && !defined(__cplusplus)
+#if !defined(__cplusplus)
   __try
 #else
   try
@@ -139,7 +139,7 @@ mythread(void * arg)
 	  pthread_testcancel();
 	}
     }
-#if defined(_MSC_VER) && !defined(__cplusplus)
+#if !defined(__cplusplus)
   __except(EXCEPTION_EXECUTE_HANDLER)
 #else
 #if defined(PtW32CatchAll)
@@ -243,7 +243,7 @@ main()
   return 0;
 }
 
-#else /* defined(_MSC_VER) || defined(__cplusplus) */
+#else /* defined(__cplusplus) */
 
 #include <stdio.h>
 
@@ -254,4 +254,5 @@ main()
   return 0;
 }
 
-#endif /* defined(_MSC_VER) || defined(__cplusplus) */
+#endif /* defined(__cplusplus) */
+
diff --git a/tests/cancel3.c b/tests/cancel3.c
index 8c7bd9f..5020648 100644
--- a/tests/cancel3.c
+++ b/tests/cancel3.c
@@ -139,7 +139,7 @@ main ()
   /*
    * Code to control or munipulate child threads should probably go here.
    */
-  Sleep (500);
+  Sleep (NUMTHREADS * 100);
 
   for (i = 1; i <= NUMTHREADS; i++)
     {
@@ -147,7 +147,7 @@ main ()
     }
 
   /*
-   * Give threads time to run.
+   * Give threads time to complete.
    */
   Sleep (NUMTHREADS * 100);