diff options
| author | aaron <aaron@13f79535-47bb-0310-9956-ffa450edef68> | 2002-09-05 05:25:04 +0000 |
|---|---|---|
| committer | aaron <aaron@13f79535-47bb-0310-9956-ffa450edef68> | 2002-09-05 05:25:04 +0000 |
| commit | 8db012560980846688e5e2862d9d63ba670ca038 (patch) | |
| tree | d88cddd73764c5aa253ea2944b5ef58dd4cf8a64 | |
| parent | 82c87f6898f30381ff7ccd11d5bea567e9b0607d (diff) | |
| download | libapr-8db012560980846688e5e2862d9d63ba670ca038.tar.gz | |
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.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63850 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | test/Makefile.in | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 7f069db9c..0bf9228ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,15 +127,8 @@ apr.exp: exports.c export_vars.h 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 diff --git a/test/Makefile.in b/test/Makefile.in index d03dd6f7c..2ad52775c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -59,6 +59,16 @@ CLEAN_TARGETS = testfile.tmp testdso@EXEEXT@ mod_test.slo 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 testfile@EXEEXT@: testfile.lo $(LOCAL_LIBS) $(LINK) testfile.lo $(LOCAL_LIBS) $(ALL_LIBS) |