Hi,
A really trivial fix to a really obscure bug.
Log message per HACKING:
Fix UTF-8 test failure when Subversion was built with apr-iconv from the
default location (i.e. when --with-apr-iconv was not specified).
* win-tests.py
(locate_libs): Ensure apriconv_so_path (and hence APR_ICONV_PATH) is
set to an absolute path.
Kind regards,
Jon Foster
[Patch attached to prevent mangling by my mail client]
Index: win-tests.py
===================================================================
--- win-tests.py (revision 10770)
+++ win-tests.py (working copy)
@@ -158,7 +158,10 @@
aprutil_dll_path = os.path.join(aprutil_path, objdir, 'libaprutil.dll')
apriconv_path = get(cp, 'options', '--with-apr-iconv', 'apr-iconv')
apriconv_dll_path = os.path.join(apriconv_path, objdir, 'libapriconv.dll')
- apriconv_so_path = os.path.join(apriconv_path, objdir, 'iconv')
+ # We ensure thata apriconv_so_path is absolute, as it is used to set
+ # APR_ICONV_PATH. We must ensure APR_ICONV_PATH is still valid when we
+ # change directory to run the tests!
+ apriconv_so_path = os.path.join(os.getcwd(), apriconv_path, objdir, 'iconv')
shutil.copy(apr_dll_path, abs_objdir)
shutil.copy(aprutil_dll_path, abs_objdir)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 31 01:43:46 2004