3 files changed, 10 insertions, 110 deletions

diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index 43e8c535e..560a424cb 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -1,106 +1,6 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# uClibc pthread tests
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 
-include ../Rules.mak
+include ../Test.mak
 
-LDFLAGS += 
-#EXTRA_LIBS += -lc -lgcc -lpthread
-EXTRA_LIBS += -lpthread
-
-TARGETS=ex1 ex2 ex3 ex4 ex5 ex6 ex7
-all: $(TARGETS)
-
-ex1: ex1.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-ex2: ex2.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-ex3: ex3.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-ex4: ex4.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-ex5: ex5.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-ex6: ex6.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-ex7: ex7.c Makefile $(TESTDIR)/Rules.mak
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling $@ vs uClibc: "
-	-@ echo " "
-	$(CC) $(CFLAGS) -c $< -o $@.o
-	$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIPTOOL) -x -R .note -R .comment $@
-	./$@
-	-@ echo " "
-
-clean:
-	$(RM) *.[oa] *~ core $(TARGETS)
+EXTRA_LDFLAGS := -lpthread
diff --git a/test/pthread/ex3.c b/test/pthread/ex3.c
index 8005200ef..8ef779789 100644
--- a/test/pthread/ex3.c
+++ b/test/pthread/ex3.c
@@ -23,12 +23,12 @@ volatile int started;
 
 int main(int argc, char ** argv)
 {
-  int i;
-  int pid;
+  unsigned long i;
+  unsigned long pid;
 
   /* create a number to search for */
   pid = getpid();
-  printf("Searching for the number = %d...\n", pid);
+  printf("Searching for the number = %ld...\n", pid);
 
   /* Initialize the mutex lock */
   pthread_mutex_init(&lock, NULL);
@@ -66,8 +66,8 @@ void print_it(void *arg)
 
 void *search(void *arg)
 {
-  int num = (int) arg;
-  int i, j, ntries;
+  unsigned long num = (unsigned long) arg;
+  unsigned long i, j, ntries;
   pthread_t tid;
 
   /* get the calling thread ID */
diff --git a/test/pthread/ex7.c b/test/pthread/ex7.c
index fadaccaa1..bda2ca9eb 100644
--- a/test/pthread/ex7.c
+++ b/test/pthread/ex7.c
@@ -25,7 +25,7 @@ event_t main_event;
 void *
 test_thread (void *ms_param)
 {
-    int status = 0;
+    unsigned long status = 0;
     event_t foo;
     struct timespec time;
     struct timeval  now;