You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rp...@apache.org on 2009/03/25 12:02:49 UTC
svn commit: r758215 - in /apr/apr/trunk/test: Makefile.in dbd.c
Author: rpluem
Date: Wed Mar 25 11:02:47 2009
New Revision: 758215
URL: http://svn.apache.org/viewvc?rev=758215&view=rev
Log:
* Make dbd driver tests from APR-UTIL run again
Added:
apr/apr/trunk/test/dbd.c
- copied unchanged from r758212, apr/apr-util/trunk/test/dbd.c
Modified:
apr/apr/trunk/test/Makefile.in
Modified: apr/apr/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.in?rev=758215&r1=758214&r2=758215&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.in (original)
+++ apr/apr/trunk/test/Makefile.in Wed Mar 25 11:02:47 2009
@@ -18,7 +18,8 @@
STDTEST_PORTABLE = \
testlockperf@EXEEXT@ \
testmutexscope@EXEEXT@ \
- testall@EXEEXT@
+ testall@EXEEXT@ \
+ dbd@EXEEXT@ \
TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo testshm.lo \
testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
@@ -163,15 +164,32 @@
tryread@EXEEXT@: $(OBJECTS_tryread)
$(LINK_PROG) $(OBJECTS_tryread) $(ALL_LIBS)
+OBJECTS_dbd = dbd.lo $(LOCAL_LIBS)
+dbd@EXEEXT@: $(OBJECTS_dbd)
+ $(LINK_PROG) $(OBJECTS_dbd) $(APRUTIL_LIBS)
+
check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
teststatus=0; \
progfailed=""; \
for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
- ./$$prog; \
- status=$$?; \
- if test $$status != 0; then \
- teststatus=$$status; \
- progfailed="$$progfailed $$prog"; \
+ if test "$$prog" = 'dbd'; then \
+ for driver in @apu_dbd_tests@; do \
+ @shlibpath_var@="`echo "../dbd/.libs:../ldap/.libs:$$@shlibpath_var@" | sed -e 's/::*$$//'`" \
+ ./$$prog $$driver; \
+ status=$$?; \
+ if test $$status != 0; then \
+ teststatus=$$status; \
+ progfailed="$$progfailed '$$prog $$driver'"; \
+ fi; \
+ done; \
+ else \
+ @shlibpath_var@="`echo "../dbd/.libs:../ldap/.libs:$$@shlibpath_var@" | sed -e 's/::*$$//'`" \
+ ./$$prog; \
+ status=$$?; \
+ if test $$status != 0; then \
+ teststatus=$$status; \
+ progfailed="$$progfailed $$prog"; \
+ fi; \
fi; \
done; \
if test $$teststatus != 0; then \