diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2019-02-25 06:34:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 06:34:49 -0700 |
| commit | 7aebced7e5ac26ba0ab2171b24991350523e9aa3 (patch) | |
| tree | 18cf296fe515fb911f852f46bdc7b62a2f38418e /numpy/distutils/tests | |
| parent | 8d95cc1caa65d8d379f3c4f7e1885eb41e9ab226 (diff) | |
| parent | 00ccdfc1c5a0602de60010ca61b7dc7f019f1e9a (diff) | |
| download | numpy-7aebced7e5ac26ba0ab2171b24991350523e9aa3.tar.gz | |
Merge pull request #12925 from eric-wieser/distutils-shlex-split
BUG: parse shell escaping in extra_compile_args and extra_link_args
Diffstat (limited to 'numpy/distutils/tests')
| -rw-r--r-- | numpy/distutils/tests/test_system_info.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/distutils/tests/test_system_info.py b/numpy/distutils/tests/test_system_info.py index 4aec13c82..f7e275a2e 100644 --- a/numpy/distutils/tests/test_system_info.py +++ b/numpy/distutils/tests/test_system_info.py @@ -11,6 +11,7 @@ from numpy.distutils import ccompiler, customized_ccompiler from numpy.testing import assert_, assert_equal from numpy.distutils.system_info import system_info, ConfigParser from numpy.distutils.system_info import default_lib_dirs, default_include_dirs +from numpy.distutils import _shell_utils def get_class(name, notfound_action=1): @@ -29,7 +30,7 @@ simple_site = """ [ALL] library_dirs = {dir1:s}{pathsep:s}{dir2:s} libraries = {lib1:s},{lib2:s} -extra_compile_args = -I/fake/directory +extra_compile_args = -I/fake/directory -I"/path with/spaces" -Os runtime_library_dirs = {dir1:s} [temp1] @@ -40,7 +41,7 @@ runtime_library_dirs = {dir1:s} [temp2] library_dirs = {dir2:s} libraries = {lib2:s} -extra_link_args = -Wl,-rpath={lib2:s} +extra_link_args = -Wl,-rpath={lib2_escaped:s} rpath = {dir2:s} """ site_cfg = simple_site @@ -137,7 +138,8 @@ class TestSystemInfoReading(object): 'lib1': self._lib1, 'dir2': self._dir2, 'lib2': self._lib2, - 'pathsep': os.pathsep + 'pathsep': os.pathsep, + 'lib2_escaped': _shell_utils.NativeParser.join([self._lib2]) }) # Write site.cfg fd, self._sitecfg = mkstemp() @@ -181,7 +183,7 @@ class TestSystemInfoReading(object): assert_equal(tsi.get_libraries(), [self._lib1, self._lib2]) assert_equal(tsi.get_runtime_lib_dirs(), [self._dir1]) extra = tsi.calc_extra_info() - assert_equal(extra['extra_compile_args'], ['-I/fake/directory']) + assert_equal(extra['extra_compile_args'], ['-I/fake/directory', '-I/path with/spaces', '-Os']) def test_temp1(self): # Read in all information in the temp1 block |