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/05/31 13:50:59 UTC
svn commit: r780412 - /apr/apr-util/branches/1.3.x/test/Makefile.in
Author: rpluem
Date: Sun May 31 11:50:59 2009
New Revision: 780412
URL: http://svn.apache.org/viewvc?rev=780412&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/branches/1.3.x/test/Makefile.in
Modified: apr/apr-util/branches/1.3.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/test/Makefile.in?rev=780412&r1=780411&r2=780412&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/test/Makefile.in (original)
+++ apr/apr-util/branches/1.3.x/test/Makefile.in Sun May 31 11:50:59 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 "../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 "../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: r780412 - /apr/apr-util/branches/1.3.x/test/Makefile.in
Posted by Ruediger Pluem <rp...@apache.org>.
On 06/02/2009 10:27 AM, Rainer Jung wrote:
> Hi Rüdiger,
>
> On 31.05.2009 13:50, rpluem@apache.org wrote:
>> Author: rpluem
>> Date: Sun May 31 11:50:59 2009
>> New Revision: 780412
>>
>> URL: http://svn.apache.org/viewvc?rev=780412&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/branches/1.3.x/test/Makefile.in
>
> are you going to apply this and r780413 also to the 1.4 branch?
Done.
Regards
Rüdiger
Re: svn commit: r780412 - /apr/apr-util/branches/1.3.x/test/Makefile.in
Posted by Rainer Jung <ra...@kippdata.de>.
Hi Rüdiger,
On 31.05.2009 13:50, rpluem@apache.org wrote:
> Author: rpluem
> Date: Sun May 31 11:50:59 2009
> New Revision: 780412
>
> URL: http://svn.apache.org/viewvc?rev=780412&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/branches/1.3.x/test/Makefile.in
are you going to apply this and r780413 also to the 1.4 branch?
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.
Regards,
Rainer