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/06/02 21:43:48 UTC
svn commit: r781139 - /apr/apr-util/trunk/test/Makefile.in
Author: rpluem
Date: Tue Jun 2 19:43:48 2009
New Revision: 781139
URL: http://svn.apache.org/viewvc?rev=781139&view=rev
Log:
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
Modified:
apr/apr-util/trunk/test/Makefile.in
Modified: apr/apr-util/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.in?rev=781139&r1=781138&r2=781139&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.in (original)
+++ apr/apr-util/trunk/test/Makefile.in Tue Jun 2 19:43:48 2009
@@ -61,13 +61,15 @@
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 \
Re: svn commit: r781139 - /apr/apr-util/trunk/test/Makefile.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Ruediger Pluem wrote:
>
> As you notice the original first commit to this problem went to apr/apr/trunk.
I had missed that; thanks!
Re: svn commit: r781139 - /apr/apr-util/trunk/test/Makefile.in
Posted by Ruediger Pluem <rp...@apache.org>.
On 06/02/2009 11:09 PM, William A. Rowe, Jr. wrote:
> rpluem@apache.org wrote:
>> Modified:
>> apr/apr-util/trunk/test/Makefile.in
>
> apr/apr-util/trunk is dead, see the now-combined apr/apr/trunk
>
I know, I know. See the excerpt from Rainers mail below for the rationale:
> Although apr-util trunk is supposed to go away, at the moment there
> still is a test directory in apr-util trunk, which contains the same
> problem in Makefile.in. At least in theory some 1.5 branch of apr-util
> could be branches from apr-util trunk, so IMHO it would be best to fix
> apr-util trunk too.
As it was not a big pain to do so, I did it.
As you notice the original first commit to this problem went to apr/apr/trunk.
Regards
Rüdiger
Re: svn commit: r781139 - /apr/apr-util/trunk/test/Makefile.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
rpluem@apache.org wrote:
> Modified:
> apr/apr-util/trunk/test/Makefile.in
apr/apr-util/trunk is dead, see the now-combined apr/apr/trunk