Index: tools/testrunner/local/testsuite.py |
diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py |
index 0fd3f3a3000a35ac2c06549b36e7c4cecd907e80..77d2e0d9890f248d3faf22241edbf07f0869603b 100644 |
--- a/tools/testrunner/local/testsuite.py |
+++ b/tools/testrunner/local/testsuite.py |
@@ -35,17 +35,19 @@ from . import utils |
class TestSuite(object): |
@staticmethod |
- def LoadTestSuite(root): |
+ def LoadTestSuite(root, default): |
name = root.split(os.path.sep)[-1] |
f = None |
try: |
(f, pathname, description) = imp.find_module("testcfg", [root]) |
module = imp.load_module("testcfg", f, pathname, description) |
- suite = module.GetSuite(name, root) |
+ return module.GetSuite(name, root) |
+ except: |
+ # Use default if no testcfg is present. |
+ return default(name, root) |
finally: |
if f: |
f.close() |
- return suite |
def __init__(self, name, root): |
self.name = name # string |