Index: tools/test_all.py |
diff --git a/gm/rebaseline_server/test_all.py b/tools/test_all.py |
similarity index 70% |
copy from gm/rebaseline_server/test_all.py |
copy to tools/test_all.py |
index 299d1340f23ec78664070d96510f81d296a3feb6..6467a2160be7598a6d40014de8e63e62fc7878a9 100755 |
--- a/gm/rebaseline_server/test_all.py |
+++ b/tools/test_all.py |
@@ -7,16 +7,20 @@ Use of this source code is governed by a BSD-style license that can be |
found in the LICENSE file. |
Run all unittests within this directory tree, recursing into subdirectories. |
- |
-TODO(epoger): Launch this automatically on the housekeeper bot, but first make |
-sure it works properly after having been checked out (from both git and svn) |
""" |
import os |
import unittest |
+from tests import skimage_self_test |
+ |
def main(): |
+ # First, run any tests that cannot be automatically discovered (because |
+ # they don't use Python's unittest framework). |
+ skimage_self_test.main() |
+ |
+ # Now discover/run all tests that use Python's unittest framework. |
suite = unittest.TestLoader().discover(os.path.dirname(__file__), |
pattern='*_test.py') |
results = unittest.TextTestRunner(verbosity=2).run(suite) |