From 844b89dbfdd41ced4666d2bb99ce0bf99503524b Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 20 Jan 2001 00:45:14 +0000 Subject: Reworked all test suite makefiles (man did they need it). Refactored testsuite.h so it behaves the way I want it to. As policy now, all test apps are _supposed_ to use testsuite.h (not all have been converted to do this yet). It is simple, clean, and works. -Erik --- test/pwd_grp/Makefile | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) (limited to 'test/pwd_grp') diff --git a/test/pwd_grp/Makefile b/test/pwd_grp/Makefile index 212765de4..295cc8e23 100644 --- a/test/pwd_grp/Makefile +++ b/test/pwd_grp/Makefile @@ -1,17 +1,5 @@ -TOPDIR=../../ -include $(TOPDIR)Rules.mak - -# Check if 'ls -sh' works or not -LSFLAGS = $(shell if ls -sh >/dev/null 2>&1; \ - then echo "-sh"; else echo "-s" ; fi) - -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 -lgcc - -YCFLAGS = -Wall -Os -fomit-frame-pointer -YLDFLAGS = -s --static +TESTDIR=../ +include $(TESTDIR)/Rules.mak TARGETS=test_pwd test_pwd_glibc @@ -20,46 +8,46 @@ TARGETS+=test_pwd_diff test_grp_diff all: $(TARGETS) -test_pwd: test_pwd.c Makefile $(TOPDIR)libc.a +test_pwd: test_pwd.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC) -@ echo "-------" -@ echo " " -@ echo "Compiling vs uClibc: " -@ echo " " - $(CC) $(XCFLAGS) -c $< -o $@.o - $(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS) + $(TESTCC) $(CFLAGS) -c $< -o $@.o + $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS) $(STRIPTOOL) -x -R .note -R .comment $@ -./$@ 2>&1 >test_pwd.out -@ echo " " -test_pwd_glibc: test_pwd.c Makefile $(TOPDIR)libc.a +test_pwd_glibc: test_pwd.c Makefile -@ echo "-------" -@ echo " " -@ echo "Compiling vs GNU libc: " -@ echo " " - $(CC) $(YCFLAGS) -c $< -o $@.o - $(CC) $(YLDFLAGS) --static $@.o -o $@ + $(CC) $(CFLAGS) -c $< -o $@.o + $(CC) $(LDFLAGS) $@.o -o $@ $(STRIPTOOL) -x -R .note -R .comment $@ -./$@ 2>&1 >test_pwd_glibc.out -@ echo " " -test_grp: test_grp.c Makefile $(TOPDIR)libc.a +test_grp: test_grp.c Makefile $(TESTDIR)/Config $(TESTDIR)/Rules.mak $(TESTCC) -@ echo "-------" -@ echo " " -@ echo "Compiling vs uClibc: " -@ echo " " - $(CC) $(XCFLAGS) -c $< -o $@.o - $(CC) $(XLDFLAGS) $@.o -o $@ $(EXTRA_LIBS) + $(TESTCC) $(CFLAGS) -c $< -o $@.o + $(TESTCC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LIBS) $(STRIPTOOL) -x -R .note -R .comment $@ -./$@ 2>&1 >test_grp.out -@ echo " " -test_grp_glibc: test_grp.c Makefile $(TOPDIR)libc.a +test_grp_glibc: test_grp.c Makefile -@ echo "-------" -@ echo " " -@ echo "Compiling vs GNU libc: " -@ echo " " - $(CC) $(YCFLAGS) -c $< -o $@.o - $(CC) $(YLDFLAGS) --static $@.o -o $@ + $(CC) $(CFLAGS) -c $< -o $@.o + $(CC) $(LDFLAGS) $@.o -o $@ $(STRIPTOOL) -x -R .note -R .comment $@ -./$@ 2>&1 >test_grp_glibc.out -@ echo " " -- cgit v1.2.3