* tst-join5.c (tf1, tf2): Add a cast.

	* Makeconfig (includes): Append -I$(..)nptl to this variable.

	* tst-barrier2.c (do_test) [! _POSIX_THREAD_PROCESS_SHARED]:
	Don't test anything.
	* tst-cond4.c: Likewise.
	* tst-cond6.c: Likewise.
	* tst-flock2.c: Likewise.
	* tst-mutex4.c: Likewise.
	* tst-rwlock4.c: Likewise.
	* tst-signal1.c: Likewise.
	* tst-spin2.c: Likewise.
	* tst-cond11.c [! _POSIX_CLOCK_SELECTION]: Likewise.

	* tst-mutex4.c: Use test-skeleton.c.
	* tst-spin2.c: Likewise.
	* tst-sysconf.c: Likewise.
	* tst-barrier2.c: Likewise.
	* tst-cond4.c: Likewise.
	* tst-cond6.c: Likewise.
	* tst-rwlock4.c: Likewise.
	* tst-unload.c: Likewise.
	* tst-flock2.c (do_test): Use return instead of exit.

1 files changed, 34 insertions, 23 deletions

diff --git a/nptl/tst-rwlock4.c b/nptl/tst-rwlock4.c
index 2bf5416..b3dddd9 100644
--- a/nptl/tst-rwlock4.c
+++ b/nptl/tst-rwlock4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -28,9 +28,16 @@
 #include <sys/wait.h>
 
 
-int
-main (void)
+static int
+do_test (void)
 {
+#if ! _POSIX_THREAD_PROCESS_SHARED
+
+  puts ("_POSIX_THREAD_PROCESS_SHARED not supported, test skipped");
+  return 0;
+
+#else
+
   size_t ps = sysconf (_SC_PAGESIZE);
   char tmpfname[] = "/tmp/tst-rwlock4.XXXXXX";
   char data[ps];
@@ -47,7 +54,7 @@ main (void)
   if (fd == -1)
     {
       printf ("cannot open temporary file: %m\n");
-      exit (1);
+      return 1;
     }
 
   /* Make sure it is always removed.  */
@@ -60,14 +67,14 @@ main (void)
   if (write (fd, data, ps) != ps)
     {
       puts ("short write");
-      exit (1);
+      return 1;
     }
 
   mem = mmap (NULL, ps, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
   if (mem == MAP_FAILED)
     {
       printf ("mmap failed: %m\n");
-      exit (1);
+      return 1;
     }
 
   r = (pthread_rwlock_t *) (((uintptr_t) mem + __alignof (pthread_rwlock_t))
@@ -77,67 +84,67 @@ main (void)
   if (pthread_rwlockattr_init (&a) != 0)
     {
       puts ("rwlockattr_init failed");
-      exit (1);
+      return 1;
     }
 
   if (pthread_rwlockattr_getpshared (&a, &s) != 0)
     {
       puts ("1st rwlockattr_getpshared failed");
-      exit (1);
+      return 1;
     }
 
   if (s != PTHREAD_PROCESS_PRIVATE)
     {
       puts ("default pshared value wrong");
-      exit (1);
+      return 1;
     }
 
   if (pthread_rwlockattr_setpshared (&a, PTHREAD_PROCESS_SHARED) != 0)
     {
       puts ("rwlockattr_setpshared failed");
-      exit (1);
+      return 1;
     }
 
   if (pthread_rwlockattr_getpshared (&a, &s) != 0)
     {
       puts ("2nd rwlockattr_getpshared failed");
-      exit (1);
+      return 1;
     }
 
   if (s != PTHREAD_PROCESS_SHARED)
     {
       puts ("pshared value after setpshared call wrong");
-      exit (1);
+      return 1;
     }
 
   if (pthread_rwlock_init (r, &a) != 0)
     {
       puts ("rwlock_init failed");
-      exit (1);
+      return 1;
     }
 
   if (pthread_rwlock_rdlock (r) != 0)
     {
       puts ("rwlock_rdlock failed");
-      exit (1);
+      return 1;
     }
 
   if (pthread_rwlockattr_destroy (&a) != 0)
     {
       puts ("rwlockattr_destroy failed");
-      exit (1);
+      return 1;
     }
 
   err = pthread_rwlock_trywrlock (r);
   if (err == 0)
     {
       puts ("rwlock_trywrlock succeeded");
-      exit (1);
+      return 1;
     }
   else if (err != EBUSY)
     {
       puts ("rwlock_trywrlock didn't return EBUSY");
-      exit (1);
+      return 1;
     }
 
   *p = 0;
@@ -147,7 +154,7 @@ main (void)
   if (pid == -1)
     {
       puts ("fork failed");
-      exit (1);
+      return 1;
     }
   else if (pid == 0)
     {
@@ -155,13 +162,13 @@ main (void)
       if ((*p)++ != 0)
 	{
 	  puts ("child: *p != 0");
-	  exit (1);
+	  return 1;
 	}
 
       if (pthread_rwlock_unlock (r) != 0)
 	{
 	  puts ("child: 1st rwlock_unlock failed");
-	  exit (1);
+	  return 1;
 	}
 
       puts ("child done");
@@ -171,17 +178,21 @@ main (void)
       if (pthread_rwlock_wrlock (r) != 0)
 	{
 	  puts ("parent: rwlock_wrlock failed");
-	  exit (1);
+	  return 1;
 	}
 
       if (*p != 1)
 	{
 	  puts ("*p != 1");
-	  exit (1);
+	  return 1;
 	}
 
       puts ("parent done");
     }
 
-  exit (0);
+  return 0;
+#endif
 }
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"