1999-02-23 Ross Johnson <rpj@ise.canberra.edu.au>

        * Makefile: Now actually runs the tests.
        * tests.h: Define our own assert macro. The Mingw32
        version pops up a dialog but we want to run non-interactively.
        * equal1.c: use assert a little more directly so that it
        prints the actual call statement.
        * exit1.c: Modify to return 0 on success, 1 on failure.

1 files changed, 19 insertions, 32 deletions

diff --git a/tests/equal1.c b/tests/equal1.c
index d882adc..617a956 100644
--- a/tests/equal1.c
+++ b/tests/equal1.c
@@ -4,44 +4,31 @@
  * Depends on functions: pthread_create().
  */
 
-#include <pthread.h>
-#include <stdio.h>
-#include <windows.h>
+#include "test.h"
 
 void * func(void * arg)
 {
   Sleep(2000);
   return 0;
 }
- 
+
+int 
 main()
 {
-        int rc;
-        pthread_t t1, t2;
-        if (pthread_create(&t1, NULL, func, (void *) 1) != 0)
-	  {
-	    return 1;
-	  }
-
-        if (pthread_create(&t2, NULL, func, (void *) 2) != 0)
-	  {
-	    return 1;
-	  }
-
-        if (pthread_equal(t1, t2))
-	  {
-	    return 1;
-	  }
-
-        if (pthread_equal(t1,t1) == 0)
-	  {
-	    return 1;
-	  }
-
-	/* This is a hack. We don't want to rely on pthread_join
-	   yet if we can help it. */
-        Sleep(8000);
-
-	/* Success. */
-	return 0;
+  pthread_t t1, t2;
+
+  assert(pthread_create(&t1, NULL, func, (void *) 1) == 0);
+
+  assert(pthread_create(&t2, NULL, func, (void *) 2) == 0);
+
+  assert(pthread_equal(t1, t2) == 0);
+
+  assert(pthread_equal(t1,t1) != 0);
+
+  /* This is a hack. We don't want to rely on pthread_join
+     yet if we can help it. */
+   Sleep(4000);
+
+  /* Success. */
+  return 0;
 }