Updated numpy.distutils tests site.

9 files changed, 84 insertions, 60 deletions

diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py
index 1c1ca955b..ed369bc6c 100644
--- a/numpy/distutils/tests/f2py_ext/setup.py
+++ b/numpy/distutils/tests/f2py_ext/setup.py
@@ -1,12 +1,11 @@
-
-import os
-from numpy.distutils.core import setup, Extension
-
-ext = Extension('f2py_ext.fib2',['src/fib2.pyf','src/fib1.f'])
-
-setup(
-    name = 'f2py_ext',
-    ext_modules = [ext],
-    packages = ['f2py_ext.tests','f2py_ext'],
-    package_dir = {'f2py_ext':'.'})
-
+#!/usr/bin/env python
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('f2py_ext',parent_package,top_path)
+    config.add_extension('fib2', ['src/fib2.pyf','src/fib1.f'])
+    config.add_data_dir('tests')
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py
index f892a5738..7183d2192 100644
--- a/numpy/distutils/tests/f2py_f90_ext/setup.py
+++ b/numpy/distutils/tests/f2py_f90_ext/setup.py
@@ -1,16 +1,16 @@
+#!/usr/bin/env python
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('f2py_f90_ext',parent_package,top_path)
+    config.add_extension('foo',
+                         ['src/foo_free.f90'],
+                         include_dirs=['include'],
+                         f2py_options=['--include_paths',
+                                       config.paths('include')[0]]
+                         )
+    config.add_data_dir('tests')
+    return config
 
-import os
-from numpy_distutils.core import setup, Extension
-
-package = 'f2py_f90_ext'
-
-ext = Extension(package+'.foo',['src/foo_free.f90'],
-                include_dirs=['include'],
-                f2py_options=['--include_paths','include'])
-
-setup(
-    name = package,
-    ext_modules = [ext],
-    packages = [package+'.tests',package],
-    package_dir = {package:'.'})
-
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py
index c8b6ddee2..bbeb9b4b7 100644
--- a/numpy/distutils/tests/gen_ext/setup.py
+++ b/numpy/distutils/tests/gen_ext/setup.py
@@ -1,7 +1,4 @@
-
-import os
-from numpy.distutils.core import setup, Extension
-from distutils.dep_util import newer
+#!/usr/bin/env python
 
 fib3_f = '''
 C FILE: FIB3.F
@@ -27,21 +24,27 @@ Cf2py depend(n) a
 C END FILE FIB3.F
 '''
 
-package = 'gen_ext'
-
-def source_func(ext, src_dir):
-    source = os.path.join(src_dir,'fib3.f')
-    if newer(__file__, source):
-        f = open(source,'w')
+def source_func(ext, build_dir):
+    import os
+    from distutils.dep_util import newer
+    target = os.path.join(build_dir,'fib3.f')
+    if newer(__file__, target):
+        f = open(target,'w')
         f.write(fib3_f)
         f.close()
-    return [source]
+    return [target]
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('gen_ext',parent_package,top_path)
+    config.add_extension('fib3',
+                         [source_func]
+                         )
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
 
-ext = Extension(package+'.fib3',[source_func])
 
-setup(
-    name = package,
-    ext_modules = [ext],
-    packages = [package+'.tests',package],
-    package_dir = {package:'.'})
 
diff --git a/numpy/distutils/tests/pyrex_ext/setup.py b/numpy/distutils/tests/pyrex_ext/setup.py
index 02b5d26f1..0a8186e3f 100644
--- a/numpy/distutils/tests/pyrex_ext/setup.py
+++ b/numpy/distutils/tests/pyrex_ext/setup.py
@@ -4,6 +4,7 @@ def configuration(parent_package='',top_path=None):
     config = Configuration('pyrex_ext',parent_package,top_path)
     config.add_extension('primes',
                          ['primes.pyx'])
+    config.add_data_dir('tests')
     return config
 
 if __name__ == "__main__":
diff --git a/numpy/distutils/tests/setup.py b/numpy/distutils/tests/setup.py
new file mode 100644
index 000000000..6aac6651c
--- /dev/null
+++ b/numpy/distutils/tests/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('testnumpydistutils',parent_package,top_path)
+    config.add_subpackage('pyrex_ext')
+    config.add_subpackage('f2py_ext')
+    #config.add_subpackage('f2py_f90_ext')
+    config.add_subpackage('swig_ext')
+    config.add_subpackage('gen_ext')
+    return config
+
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py
index 65b2f6e2a..fffd858e0 100644
--- a/numpy/distutils/tests/swig_ext/setup.py
+++ b/numpy/distutils/tests/swig_ext/setup.py
@@ -1,14 +1,18 @@
+#!/usr/bin/env python
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('swig_ext',parent_package,top_path)
+    config.add_extension('_example',
+                         ['src/example.i','src/example.c']
+                         )
+    config.add_extension('_example2',
+                         ['src/zoo.i','src/zoo.cc'],
+                         depends=['src/zoo.h'],
+                         include_dirs=['src']
+                         )
+    config.add_data_dir('tests')
+    return config
 
-import os
-from numpy_distutils.core import setup, Extension
-
-ext_c = Extension('swig_ext._example',['src/example.i','src/example.c'])
-ext_cpp = Extension('swig_ext._example2',['src/zoo.i','src/zoo.cc'],
-                    depends=['src/zoo.h'],include_dirs=['src'])
-
-setup(
-    name = 'swig_ext',
-    ext_modules = [ext_c,ext_cpp],
-    packages = ['swig_ext.tests','swig_ext'],
-    package_dir = {'swig_ext':'.'})
-
+if __name__ == "__main__":
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/numpy/distutils/tests/swig_ext/src/example.i b/numpy/distutils/tests/swig_ext/src/example.i
index 6d61062b3..f4fc11e66 100644
--- a/numpy/distutils/tests/swig_ext/src/example.i
+++ b/numpy/distutils/tests/swig_ext/src/example.i
@@ -4,6 +4,9 @@
 %module example
 %{
 /* Put headers and other declarations here */
+extern double My_variable;
+extern int    fact(int);
+extern int    my_mod(int n, int m);
 %}
 
 extern double My_variable;
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py
index f219e8443..41c8512b2 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example.py
@@ -2,7 +2,7 @@ import sys
 from numpy.testing import *
 set_package_path()
 from swig_ext import example
-del sys.path[0]
+restore_path()
 
 class test_example(ScipyTestCase):
 
diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py
index 558d0d44a..3871e1776 100644
--- a/numpy/distutils/tests/swig_ext/tests/test_example2.py
+++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py
@@ -1,8 +1,8 @@
 import sys
-from numpy.base.testing import *
+from numpy.testing import *
 set_package_path()
 from swig_ext import example2
-del sys.path[0]
+restore_path()
 
 class test_example2(ScipyTestCase):