diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-15 16:13:26 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-15 16:13:26 (GMT) |
| commit | 1d175f776836ef0106d06ff2f264635df125340e (patch) | |
| tree | 0dcab83efe344871fd69ff20724f5edfc280ac9e /Lib/distutils/tests | |
| parent | 8b4d64f2564a44dadff0bd8f54f6591926044b1b (diff) | |
| parent | ccddc474c3c7c664bec879deb41bb91aa5dab109 (diff) | |
| download | cpython-1d175f776836ef0106d06ff2f264635df125340e.zip cpython-1d175f776836ef0106d06ff2f264635df125340e.tar.gz cpython-1d175f776836ef0106d06ff2f264635df125340e.tar.bz2 | |
Merge fixes for #1326113 and #12297 from 3.2
Diffstat (limited to 'Lib/distutils/tests')
| -rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 1827437..87cceee 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -178,21 +178,21 @@ class BuildExtTestCase(TempdirManager, # make sure cmd.libraries is turned into a list # if it's a string cmd = build_ext(dist) - cmd.libraries = 'my_lib' + cmd.libraries = 'my_lib, other_lib lastlib' cmd.finalize_options() - self.assertEqual(cmd.libraries, ['my_lib']) + self.assertEqual(cmd.libraries, ['my_lib', 'other_lib', 'lastlib']) # make sure cmd.library_dirs is turned into a list # if it's a string cmd = build_ext(dist) - cmd.library_dirs = 'my_lib_dir' + cmd.library_dirs = 'my_lib_dir%sother_lib_dir' % os.pathsep cmd.finalize_options() - self.assertTrue('my_lib_dir' in cmd.library_dirs) + self.assertEqual(cmd.library_dirs, ['my_lib_dir', 'other_lib_dir']) # make sure rpath is turned into a list - # if it's a list of os.pathsep's paths + # if it's a string cmd = build_ext(dist) - cmd.rpath = os.pathsep.join(['one', 'two']) + cmd.rpath = 'one%stwo' % os.pathsep cmd.finalize_options() self.assertEqual(cmd.rpath, ['one', 'two']) |