summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-06-29 23:10:59 +0000
committerMike Frysinger <vapier@gentoo.org>2005-06-29 23:10:59 +0000
commitd651de236da8a51c096995cf250b7455ec3caa0c (patch)
tree3697143dfbea9366520feba820108a8b51b43281
parent005b595328394a33878320677cb6fe896bafda37 (diff)
simplify TESTDIR setting and touchup
-rw-r--r--test/args/Makefile6
-rw-r--r--test/assert/Makefile6
-rw-r--r--test/crypt/Makefile5
-rw-r--r--test/ctype/Makefile3
-rw-r--r--test/dlopen/Makefile5
-rw-r--r--test/malloc/Makefile4
-rw-r--r--test/math/Makefile4
-rw-r--r--test/misc/Makefile3
-rw-r--r--test/mmap/Makefile4
-rw-r--r--test/pthread/Makefile21
-rw-r--r--test/pwd_grp/Makefile4
-rw-r--r--test/setjmp/Makefile4
-rw-r--r--test/signal/Makefile3
-rw-r--r--test/silly/Makefile5
-rw-r--r--test/stat/Makefile3
-rw-r--r--test/stdlib/Makefile5
-rw-r--r--test/string/Makefile4
-rw-r--r--test/termios/Makefile5
-rw-r--r--test/unistd/Makefile5
19 files changed, 38 insertions, 61 deletions
diff --git a/test/args/Makefile b/test/args/Makefile
index dd5339a03..60c69685b 100644
--- a/test/args/Makefile
+++ b/test/args/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=arg_test
all: $(TARGETS)
@@ -36,5 +34,3 @@ arg_test: arg_test.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak
clean:
$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/assert/Makefile b/test/assert/Makefile
index 3771224dc..15430ec80 100644
--- a/test/assert/Makefile
+++ b/test/assert/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=assert
all: $(TARGETS)
@@ -36,5 +34,3 @@ assert: assert.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak
clean:
$(RM) *.[oa] *~ core $(TARGETS)
-
-
diff --git a/test/crypt/Makefile b/test/crypt/Makefile
index 4d5e1257f..b0cd589cc 100644
--- a/test/crypt/Makefile
+++ b/test/crypt/Makefile
@@ -16,10 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
TARGETS=crypt md5c-test
EXTRA_LIBS=-lcrypt
diff --git a/test/ctype/Makefile b/test/ctype/Makefile
index 37d055144..750f9c66c 100644
--- a/test/ctype/Makefile
+++ b/test/ctype/Makefile
@@ -16,8 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
TARGETS=ctype ctype_run
all: $(TARGETS)
diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile
index 98a48d4f0..4ed566079 100644
--- a/test/dlopen/Makefile
+++ b/test/dlopen/Makefile
@@ -15,10 +15,9 @@
# 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
-# Makefile for uClibc
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
+
DEBUG_LIBS=X
#DEBUG_LIBS=LD_DEBUG
diff --git a/test/malloc/Makefile b/test/malloc/Makefile
index 714eade71..4d8f9b4bf 100644
--- a/test/malloc/Makefile
+++ b/test/malloc/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=malloc
TARGETS+=testmalloc testmalloc_glibc
diff --git a/test/math/Makefile b/test/math/Makefile
index 6eb554ccb..e43b18544 100644
--- a/test/math/Makefile
+++ b/test/math/Makefile
@@ -16,10 +16,8 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+include ../Rules.mak
-
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
CFLAGS+=-D_GNU_SOURCE -DNO_LONG_DOUBLE
EXTRA_LIBS=-lm
PERL=/usr/bin/perl
diff --git a/test/misc/Makefile b/test/misc/Makefile
index 65e275008..10199d91f 100644
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -16,8 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
CFLAGS64=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
diff --git a/test/mmap/Makefile b/test/mmap/Makefile
index 5e7133237..ce786c955 100644
--- a/test/mmap/Makefile
+++ b/test/mmap/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=mmap
all: $(TARGETS)
diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index 247c07869..fb69640de 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -1,5 +1,22 @@
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+# 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
+
+include ../Rules.mak
LDFLAGS +=
#EXTRA_LIBS += -lc -lgcc -lpthread
diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile
index fdfb1d8c4..d12cecb04 100644
--- a/test/pwd_grp/Makefile
+++ b/test/pwd_grp/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=test_pwd test_pwd_glibc
TARGETS+=test_grp test_grp_glibc
diff --git a/test/setjmp/Makefile b/test/setjmp/Makefile
index 83e9a885d..46f98f3e0 100644
--- a/test/setjmp/Makefile
+++ b/test/setjmp/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=setjmp_test
all: $(TARGETS)
diff --git a/test/signal/Makefile b/test/signal/Makefile
index f193b16d1..cf3144c0d 100644
--- a/test/signal/Makefile
+++ b/test/signal/Makefile
@@ -16,8 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
CFLAGS += -D_GNU_SOURCE
diff --git a/test/silly/Makefile b/test/silly/Makefile
index f9d4a1d10..7207b1536 100644
--- a/test/silly/Makefile
+++ b/test/silly/Makefile
@@ -16,10 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
TARGETS=hello_source hello hello_glibc tiny
diff --git a/test/stat/Makefile b/test/stat/Makefile
index 0b6b3c665..5c8e5e12a 100644
--- a/test/stat/Makefile
+++ b/test/stat/Makefile
@@ -16,8 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
+include ../Rules.mak
CFLAGS64=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
diff --git a/test/stdlib/Makefile b/test/stdlib/Makefile
index 49a321a99..87199ed3c 100644
--- a/test/stdlib/Makefile
+++ b/test/stdlib/Makefile
@@ -16,10 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
TARGETS+=teststrtol teststrtol_glibc teststrtol_diff
TARGETS+=qsort qsort_glibc qsort_diff
diff --git a/test/string/Makefile b/test/string/Makefile
index b55788fd3..1d28c0874 100644
--- a/test/string/Makefile
+++ b/test/string/Makefile
@@ -16,9 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
+include ../Rules.mak
TARGETS=string string_glibc
TARGETS+=testcopy testcopy_glibc
diff --git a/test/termios/Makefile b/test/termios/Makefile
index 22868f4f2..de52c6156 100644
--- a/test/termios/Makefile
+++ b/test/termios/Makefile
@@ -16,10 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
TARGETS=termios termios_glibc
diff --git a/test/unistd/Makefile b/test/unistd/Makefile
index b4185c485..ff0bd805f 100644
--- a/test/unistd/Makefile
+++ b/test/unistd/Makefile
@@ -16,10 +16,7 @@
# along with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-TESTDIR=../
-include $(TESTDIR)/Rules.mak
-
-
+include ../Rules.mak
TARGETS=fork fork_glibc vfork vfork_glibc getcwd getopt getopt_long preadwrite
all: $(TARGETS)