1 files changed, 21 insertions, 173 deletions
diff --git a/test/Makefile b/test/Makefile
index ddc53a5e9..e430cf8b4 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,183 +1,31 @@
-TOPDIR=../
-include $(TOPDIR)Rules.make
+DIRS = assert ctype silly stdlib string 
 
-# Check if 'ls -sh' works or not 
-LSFLAGS = $(shell if ls -sh >/dev/null 2>&1; \
-    then echo "-sh"; else echo "-s" ; fi)
+all: $(DIRS)
 
-XCFLAGS = -Wall -Os -fomit-frame-pointer -fno-builtin -nostdinc \
-	-I$(TOPDIR)include -I/usr/include/linux
-XLDFLAGS = -nostdlib -s -gc-sections
-EXTRA_LIBS=$(TOPDIR)libc.a
+assert: dummy
+	make -C assert
 
-YCFLAGS = -Wall -Os -fomit-frame-pointer
-YLDFLAGS = -s --static 
+ctype: dummy
+	make -C ctype
 
-# Allow alternative stripping tools to be used...
-ifndef $(STRIPTOOL)
-	STRIPTOOL = strip
-endif
-STRIP    = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $@
+silly: dummy
+	make -C silly
 
-TARGETS=string string_glibc
-TARGETS+=ctype ctype_glibc
-#TARGETS+=hello_source hello hello_glibc
-#TARGETS+=testmalloc_source testmalloc testmalloc_glibc 
-#TARGETS+=teststrtol_source teststrtol teststrtol_glibc teststrtol_diff
+stdlib: dummy
+	make -C stdlib
 
-all: $(TARGETS)
+string: dummy
+	make -C string
 
-string: string.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Testing ctype functions: "
-	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	-./$@
-	-@ echo " "
-
-string_glibc: string.c testsuite.h Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Testing string functions: "
-	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
-	-./$@
-	-./$@
-	-@ echo " "
-
-ctype: ctype.c testsuite.h Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Testing ctype functions: "
-	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	-./$@
-	-@ echo " "
-
-ctype_glibc: ctype.c testsuite.h Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Testing ctype functions: "
-	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
-	-./$@
-	-./$@
-	-@ echo " "
-
-hello_source:
-	-@ rm -f $(TARGETS)
-	-@ echo "-------"
-	-@ echo "hello.c source: "
-	-@ echo " "
-	-@ cat hello.c
-	-@ echo " "
-
-hello: hello.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs uC-Libc: "
-	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIP)
-	-ldd $@
-	ls $(LSFLAGS) $@
-	-./$@
-	-@ echo " "
-
-hello_glibc: hello.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
-	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
-	$(STRIP)
-	-ldd $@
-	ls $(LSFLAGS) $@
-	-./$@
-	-@ echo " "
-
-testmalloc_source:
-	-@ echo "-------"
-	-@ echo "testmalloc.c source: "
-	-@ echo " "
-	-@ cat testmalloc.c
-	-@ echo " "
-
-testmalloc: testmalloc.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs uC-Libc: "
-	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIP)
-	-ldd $@
-	ls $(LSFLAGS) $@
-	-./$@
-	-@ echo " "
-
-testmalloc_glibc: testmalloc.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
-	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
-	$(STRIP)
-	-ldd $@
-	ls $(LSFLAGS) $@
-	-./$@
-	-@ echo " "
-
-teststrtol_source:
-	-@ echo "-------"
-	-@ echo "teststrtol.c source: "
-	-@ echo " "
-	-@ cat teststrtol.c
-	-@ echo " "
-
-teststrtol: teststrtol.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs uC-Libc: "
-	-@ echo " "
-	$(CC) $(XCFLAGS) -c $< -o $@.o
-	$(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS)
-	$(STRIP)
-	ldd $@
-	ls -sh $@
-	-./$@ | tee $@.out
-	-@ echo " "
-
-teststrtol_glibc: teststrtol.c Makefile $(TOPDIR)libc.a
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Compiling vs GNU libc: "
-	-@ echo " "
-	$(CC) $(YCFLAGS) -c $< -o $@.o
-	$(CC) $(YLDFLAGS) --static $@.o -o $@
-	$(STRIP)
-	ldd $@
-	ls -sh $@
-	-./$@ | tee $@.out
-	-@ echo " "
-
-teststrtol_diff: teststrtol_glibc teststrtol
-	-@ echo "-------"
-	-@ echo " "
-	-@ echo "Diffing output: "
-	-@ echo " "
-	-diff -u teststrtol_glibc.out teststrtol.out
-	-@ echo " "
+tags:
+	ctags -R
+	
+dummy:
 
 clean:
-	rm -f *.[oa] *~ core $(TARGETS)
-
+	make -C assert clean
+	make -C ctype clean
+	make -C silly clean
+	make -C stdlib clean
+	make -C string clean