Copy BDB & OpenSSL dlls for windows test cases.

Hi All,
    I found that after creating a Debug build of subversion
for the first time
on a windows machine, tests were failing due to unavailable
libraries.
win-tests.py was already copying APR & libintl; so I
added code to copy BDB &
OpenSSL files.
    Can somebody please review & commit this patch for
me?

[[[
* win-tests.py
  Copy BDB & OpenSSL dlls for windows test cases.
]]]

Index: win-tests.py
============================================================
=======
--- win-tests.py	(revision 22899)
+++ win-tests.py	(working copy)
 -210,10
+210,23 
   copy_changed_file(aprutil_dll_path, abs_objdir)
   copy_changed_file(apriconv_dll_path, abs_objdir)
 
-  libintl_path = get(cp, 'options', '--with-libintl', None)
-  if libintl_path is not None:
-    libintl_dll_path = os.path.join(libintl_path, 'bin',
'intl3_svn.dll')
-    copy_changed_file(libintl_dll_path, abs_objdir)
+  # List out all optional library dll locations as a tuple
containg tuples of
+  # path to dll from base library path
+  opt_lib_dll_paths = {
+    '--with-libintl':     (('bin', 'intl3_svn.dll',),),
+    '--with-berkeley-db': (('bin', 'libdb44.dll',),
+                           ('bin', 'libdb44d.dll',),),
+    '--with-openssl': (('out32dll', 'libeay32.dll',),
+                       ('out32dll', 'ssleay32.dll',),)
+  }
+  # Check if user has supplied any option for the library
and copy
+  # the dll if present
+  for (lib_opt, lib_dlls) in opt_lib_dll_paths.iteritems():
+    lib_path = get(cp, 'options', lib_opt, None)
+    if lib_path is not None:
+      for lib_dll_info in lib_dlls:
+        lib_dll_path = os.path.join(lib_path,
*lib_dll_info)
+        copy_changed_file(lib_dll_path, abs_objdir)
 
   dll_path = reduce(lambda x, y: x +
os.path.join(abs_objdir, y) + os.pathsep,
                     dll_paths, "")


------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org

Hello

> The only problem with in-tree tests is that we don't
create the
> 'subversiontestscmdline' directory. This is trivial
to fix:
>
> Index: win-tests.py
>
============================================================
=======
> --- win-tests.py        (revision 22924)
> +++ win-tests.py        (working copy)
>  -447,13 +447,14 
>      os.chdir(abs_objdir)
>      baton = copied_execs
>      os.path.walk('subversion', copy_execs, baton)
> -   
create_target_dir(CMDLINE_TEST_SCRIPT_NATIVE_PATH)
>    except:
>      os.chdir(old_cwd)
>      raise
>    else:
>      os.chdir(old_cwd)
>
> +create_target_dir(CMDLINE_TEST_SCRIPT_NATIVE_PATH)
> +
>  # Ensure the tests directory is correctly cased
>  abs_builddir = fix_case(abs_builddir)

I also see that Vlad's patch is valid for the errors in
getopt_tests.py.
Does anybody commit the patch?

Masaru

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org

masaru tsuchiyama wrote:
> Hello
> 
>> The only problem with in-tree tests is that we
don't create the
>> 'subversiontestscmdline' directory. This is
trivial to fix:
>>
>> Index: win-tests.py
>>
============================================================
=======
>> --- win-tests.py        (revision 22924)
>> +++ win-tests.py        (working copy)
>>  -447,13 +447,14 
>>      os.chdir(abs_objdir)
>>      baton = copied_execs
>>      os.path.walk('subversion', copy_execs, baton)
>> -   
create_target_dir(CMDLINE_TEST_SCRIPT_NATIVE_PATH)
>>    except:
>>      os.chdir(old_cwd)
>>      raise
>>    else:
>>      os.chdir(old_cwd)
>>
>>
+create_target_dir(CMDLINE_TEST_SCRIPT_NATIVE_PATH)
>> +
>>  # Ensure the tests directory is correctly cased
>>  abs_builddir = fix_case(abs_builddir)
> 
> I also see that Vlad's patch is valid for the errors in
getopt_tests.py.
> Does anybody commit the patch?
> 

I committed this change in r23496, thanks for reminding me!

-- 
Vlad

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribesubversion.tigris.org
For additional commands, e-mail: dev-helpsubversion.tigris.org