aaron 2002/09/04 22:25:04
Modified: . Makefile.in
test Makefile.in
Log:
Remove the toplevel "make test" target, but replace it with a simliar
"make check" (If anyone has strong feelings about this, I don't mind
changing it to "make test" again.)
Add an explicit all target to the test/Makefile that simply builds the
normal and non-portable programs.
Add a check target to the test/Makefile that makes sure all test
programs are built then runs each one.
Revision Changes Path
1.84 +2 -9 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- Makefile.in 29 Aug 2002 17:56:52 -0000 1.83
+++ Makefile.in 5 Sep 2002 05:25:04 -0000 1.84
@@ -127,15 +127,8 @@
dox:
doxygen $(top_srcdir)/docs/doxygen.conf
-test: $(TARGET_LIB)
- (cd test; make clean; make; \
- for prog in `find . -type f -perm -u+x -name "test*" -print`; do \
- ./$$prog; \
- if [ $$? -eq 255 ]; then \
- echo "$$prog failed"; \
- break; \
- fi \
- done )
+check: $(TARGET_LIB)
+ (cd test && $(MAKE) check)
# DO NOT REMOVE
docs: $(INCDIR)/*.h
1.90 +10 -0 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- Makefile.in 29 Aug 2002 17:56:52 -0000 1.89
+++ Makefile.in 5 Sep 2002 05:25:04 -0000 1.90
@@ -59,6 +59,16 @@
INCDIR=../include
INCLUDES=-I$(INCDIR)
+all: $(PROGRAMS) $(NONPORTABLE)
+
+check: $(PROGRAMS) $(NONPORTABLE)
+ for prog in $(PROGRAMS) $(NONPORTABLE); do \
+ ./$$prog; \
+ if test $$i = 255; then \
+ echo "$$prog failed"; \
+ break; \
+ fi \
+ done
[EMAIL PROTECTED]@: testfile.lo $(LOCAL_LIBS)
$(LINK) testfile.lo $(LOCAL_LIBS) $(ALL_LIBS)
