diff options
author | David Cournapeau <cournape@gmail.com> | 2009-07-26 14:50:36 +0000 |
---|---|---|
committer | David Cournapeau <cournape@gmail.com> | 2009-07-26 14:50:36 +0000 |
commit | 81ceefc3806dbb0bf007ffc5a4f1908f243db9e6 (patch) | |
tree | 1d5aea7956bc7a48273c5521f14e5a770abb2b8f /numpy/distutils/tests | |
parent | 3b3c1593db0addddeb84cf726670a2b8e2f854bf (diff) | |
download | numpy-81ceefc3806dbb0bf007ffc5a4f1908f243db9e6.tar.gz |
Fix npy_pkg_config unit test failures.
Diffstat (limited to 'numpy/distutils/tests')
-rw-r--r-- | numpy/distutils/tests/test_npy_pkg_config.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py index c1de3ae23..5553aa878 100644 --- a/numpy/distutils/tests/test_npy_pkg_config.py +++ b/numpy/distutils/tests/test_npy_pkg_config.py @@ -39,12 +39,13 @@ class TestLibraryInfo(TestCase): def test_simple(self): fd, filename = mkstemp('foo.ini') try: + pkg = os.path.splitext(filename)[0] try: os.write(fd, simple) finally: os.close(fd) - out = read_config(filename) + out = read_config(pkg) self.failUnless(out.cflags() == simple_d['cflags']) self.failUnless(out.libs() == simple_d['libflags']) self.failUnless(out.name == simple_d['name']) @@ -55,12 +56,13 @@ class TestLibraryInfo(TestCase): def test_simple_variable(self): fd, filename = mkstemp('foo.ini') try: + pkg = os.path.splitext(filename)[0] try: os.write(fd, simple_variable) finally: os.close(fd) - out = read_config(filename) + out = read_config(pkg) self.failUnless(out.cflags() == simple_variable_d['cflags']) self.failUnless(out.libs() == simple_variable_d['libflags']) self.failUnless(out.name == simple_variable_d['name']) @@ -87,8 +89,8 @@ class TestParseFlags(TestCase): def test_simple_lflags(self): d = parse_flags("-L/usr/lib -lfoo -L/usr/lib -lbar") self.failUnless(d['library_dirs'] == ['/usr/lib', '/usr/lib']) - self.failUnless(d['libs'] == ['foo', 'bar']) + self.failUnless(d['libraries'] == ['foo', 'bar']) d = parse_flags("-L /usr/lib -lfoo -L/usr/lib -lbar") self.failUnless(d['library_dirs'] == ['/usr/lib', '/usr/lib']) - self.failUnless(d['libs'] == ['foo', 'bar']) + self.failUnless(d['libraries'] == ['foo', 'bar']) |