Show More
@@ -48,9 +48,10 b' from nose.core import TestProgram' | |||
|
48 | 48 | |
|
49 | 49 | # Our own imports |
|
50 | 50 | from IPython.utils.importstring import import_item |
|
51 | from IPython.utils.path import get_ipython_module_path | |
|
51 | from IPython.utils.path import get_ipython_module_path, get_ipython_package_dir | |
|
52 | 52 | from IPython.utils.process import find_cmd, pycmd2argv |
|
53 | 53 | from IPython.utils.sysinfo import sys_info |
|
54 | from IPython.utils.warn import warn | |
|
54 | 55 | |
|
55 | 56 | from IPython.testing import globalipapp |
|
56 | 57 | from IPython.testing.plugin.ipdoctest import IPythonDoctest |
@@ -212,10 +213,8 b' def make_exclude():' | |||
|
212 | 213 | ipjoin = lambda *paths: pjoin('IPython', *paths) |
|
213 | 214 | |
|
214 | 215 | exclusions = [ipjoin('external'), |
|
215 | pjoin('IPython_doctest_plugin'), | |
|
216 | 216 | ipjoin('quarantine'), |
|
217 | 217 | ipjoin('deathrow'), |
|
218 | ipjoin('testing', 'attic'), | |
|
219 | 218 | # This guy is probably attic material |
|
220 | 219 | ipjoin('testing', 'mkdoctests'), |
|
221 | 220 | # Testing inputhook will need a lot of thought, to figure out |
@@ -223,7 +222,6 b' def make_exclude():' | |||
|
223 | 222 | # loops in the picture |
|
224 | 223 | ipjoin('lib', 'inputhook'), |
|
225 | 224 | # Config files aren't really importable stand-alone |
|
226 | ipjoin('config', 'default'), | |
|
227 | 225 | ipjoin('config', 'profile'), |
|
228 | 226 | ] |
|
229 | 227 | if not have['sqlite3']: |
@@ -280,6 +278,13 b' def make_exclude():' | |||
|
280 | 278 | # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. |
|
281 | 279 | if sys.platform == 'win32': |
|
282 | 280 | exclusions = [s.replace('\\','\\\\') for s in exclusions] |
|
281 | ||
|
282 | # check for any exclusions that don't seem to exist: | |
|
283 | parent, _ = os.path.split(get_ipython_package_dir()) | |
|
284 | for exclusion in exclusions: | |
|
285 | fullpath = pjoin(parent, exclusion) | |
|
286 | if not os.path.exists(fullpath) and not os.path.exists(fullpath + '.py'): | |
|
287 | warn("Excluding nonexistent file: %r\n" % exclusion) | |
|
283 | 288 | |
|
284 | 289 | return exclusions |
|
285 | 290 |
General Comments 0
You need to be logged in to leave comments.
Login now