diff options
author | rpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-02 19:43:48 +0000 |
---|---|---|
committer | rpluem <rpluem@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-02 19:43:48 +0000 |
commit | 56fb55efd476952ea766f917c63c5a301425b600 (patch) | |
tree | b0d3250f963ff8e6f4730cd72894a0b5be310a40 | |
parent | 97c8d1ee540e31f273b2d59cbe6007a24daf2f66 (diff) | |
download | libapr-util-56fb55efd476952ea766f917c63c5a301425b600.tar.gz |
Merge r780410 from trunk:
* Ensure that the in list in the for loop contains at least one argument as
some shell puke if this is empty.
Submitted by: rpluem
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@781139 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | test/Makefile.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 94e75b19..0d6ce232 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -61,13 +61,15 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE) progfailed=""; \ for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \ if test "$$prog" = 'dbd'; then \ - for driver in @apu_dbd_tests@; do \ - @apr_shlibpath_var@="`echo "../crypto/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \ - ./$$prog $$driver; \ - status=$$?; \ - if test $$status != 0; then \ - teststatus=$$status; \ - progfailed="$$progfailed '$$prog $$driver'"; \ + for driver in none @apu_dbd_tests@; do \ + if test "$$driver" != 'none'; then \ + @apr_shlibpath_var@="`echo "../crypto/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \ + ./$$prog $$driver; \ + status=$$?; \ + if test $$status != 0; then \ + teststatus=$$status; \ + progfailed="$$progfailed '$$prog $$driver'"; \ + fi; \ fi; \ done; \ else \ |