python: fix make check

gyoto · Sep 12, 2016 · 5f9eb50 · 5f9eb50
1 parent 18b2c62
commit 5f9eb50
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/python/Makefile.in b/python/Makefile.in
@@ -186,7 +186,7 @@ clean:
 	-rm gyoto*.py gyoto*_wrap.cxx *.pyc gyoto_doc.i gyoto_doc.i.orig
 	-rm doxygen_sqlite3.db gyoto_*installed.txt
 	-rm -f tests/*.pyc
-	-rm -Rf _gyoto.so Gyoto.egg-info
+	-rm -Rf _gyoto*.so Gyoto*.egg-info
 
 # Clean up the output of configure
 distclean: clean 
@@ -204,6 +204,7 @@ dist:
 # Use the setup.py test command
 check:
 	@DYLIB_VAR@=../lib/.libs:$$@DYLIB_VAR@ PYTHONPATH=@srcdir@:$$PYTHONPATH $(PYTHON) -B setup.py test
+	@DYLIB_VAR@=../lib/.libs:$$@DYLIB_VAR@ PYTHONPATH=@srcdir@:$$PYTHONPATH $(PYTHON) -B setup_std.py test
 
 # setup.py might complain if a directory doesn't exist so just in case, make the directory
 # here

diff --git a/python/setup_std.py.in b/python/setup_std.py.in
@@ -10,7 +10,7 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 import platform
 import re
 
@@ -52,5 +52,6 @@ setup(name='@PACKAGE_NAME@'+'_std',
       version='@PACKAGE_VERSION@',
       author_email='@PACKAGE_BUGREPORT@',
       py_modules=["gyoto_std"],
-      ext_modules=[gyoto_std_module]
+      ext_modules=[gyoto_std_module],
+      test_suite='tests_std'
      )
diff --git a/python/tests_std/__init__.py b/python/tests_std/__init__.py
diff --git a/python/tests/test_star.py → python/tests_std/test_star.py b/python/tests/test_star.py → python/tests_std/test_star.py