##// END OF EJS Templates
Small fixes for wx-dependent tests and include clearcmd....
Fernando Perez -
Show More
@@ -50,6 +50,7 b' def test_for(mod):'
50
50
51 have_curses = test_for('_curses')
51 have_curses = test_for('_curses')
52 have_wx = test_for('wx')
52 have_wx = test_for('wx')
53 have_wx_aui = test_for('wx.aui')
53 have_zi = test_for('zope.interface')
54 have_zi = test_for('zope.interface')
54 have_twisted = test_for('twisted')
55 have_twisted = test_for('twisted')
55 have_foolscap = test_for('foolscap')
56 have_foolscap = test_for('foolscap')
@@ -65,14 +66,15 b" EXCLUDE = [pjoin('IPython', 'external'),"
65 pjoin('IPython_doctest_plugin'),
66 pjoin('IPython_doctest_plugin'),
66 pjoin('IPython', 'Gnuplot'),
67 pjoin('IPython', 'Gnuplot'),
67 pjoin('IPython', 'Extensions', 'ipy_'),
68 pjoin('IPython', 'Extensions', 'ipy_'),
68 pjoin('IPython', 'Extensions', 'clearcmd'),
69 pjoin('IPython', 'Extensions', 'PhysicalQInput'),
69 pjoin('IPython', 'Extensions', 'PhysicalQInteractive'),
70 pjoin('IPython', 'Extensions', 'PhysicalQInteractive'),
71 pjoin('IPython', 'Extensions', 'InterpreterPasteInput'),
70 pjoin('IPython', 'Extensions', 'scitedirector'),
72 pjoin('IPython', 'Extensions', 'scitedirector'),
71 pjoin('IPython', 'Extensions', 'numeric_formats'),
73 pjoin('IPython', 'Extensions', 'numeric_formats'),
72 pjoin('IPython', 'testing', 'attic'),
74 pjoin('IPython', 'testing', 'attic'),
73 pjoin('IPython', 'testing', 'tutils'),
75 pjoin('IPython', 'testing', 'tutils'),
74 pjoin('IPython', 'testing', 'tools'),
76 pjoin('IPython', 'testing', 'tools'),
75 pjoin('IPython', 'testing', 'mkdoctests')
77 pjoin('IPython', 'testing', 'mkdoctests'),
76 ]
78 ]
77
79
78 if not have_wx:
80 if not have_wx:
@@ -80,6 +82,9 b' if not have_wx:'
80 EXCLUDE.append(pjoin('IPython', 'gui'))
82 EXCLUDE.append(pjoin('IPython', 'gui'))
81 EXCLUDE.append(pjoin('IPython', 'frontend', 'wx'))
83 EXCLUDE.append(pjoin('IPython', 'frontend', 'wx'))
82
84
85 if not have_wx_aui:
86 EXCLUDE.append(pjoin('IPython', 'gui', 'wx', 'wxIPython'))
87
83 if not have_objc:
88 if not have_objc:
84 EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa'))
89 EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa'))
85
90
@@ -258,7 +263,7 b' def run_iptestall():'
258 t_start = time.time()
263 t_start = time.time()
259 for name,runner in runners.iteritems():
264 for name,runner in runners.iteritems():
260 print '*'*77
265 print '*'*77
261 print 'IPython test set:',name
266 print 'IPython test group:',name
262 res = runner.run()
267 res = runner.run()
263 if res:
268 if res:
264 failed[name] = res
269 failed[name] = res
@@ -269,14 +274,14 b' def run_iptestall():'
269 # summarize results
274 # summarize results
270 print
275 print
271 print '*'*77
276 print '*'*77
272 print 'Ran %s test sets in %.3fs' % (nrunners, t_tests)
277 print 'Ran %s test groups in %.3fs' % (nrunners, t_tests)
273 print
278 print
274 if not failed:
279 if not failed:
275 print 'OK'
280 print 'OK'
276 else:
281 else:
277 # If anything went wrong, point out what command to rerun manually to
282 # If anything went wrong, point out what command to rerun manually to
278 # see the actual errors and individual summary
283 # see the actual errors and individual summary
279 print 'ERROR - %s out of %s test sets failed.' % (nfail, nrunners)
284 print 'ERROR - %s out of %s test groups failed.' % (nfail, nrunners)
280 for name in failed:
285 for name in failed:
281 failed_runner = runners[name]
286 failed_runner = runners[name]
282 print '-'*40
287 print '-'*40
@@ -297,4 +302,4 b' def main():'
297
302
298
303
299 if __name__ == '__main__':
304 if __name__ == '__main__':
300 main() No newline at end of file
305 main()
General Comments 0
You need to be logged in to leave comments. Login now