summaryrefslogtreecommitdiff
path: root/rtemstoolkit/options.py
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-11-23 15:02:52 +1100
committerChris Johns <chrisj@rtems.org>2018-11-23 15:02:52 +1100
commit7e5cdeaabeaa95b8533af626b99a43c93e5ecf6f (patch)
tree2ecd175bb744024567e6823353cd50b795604b35 /rtemstoolkit/options.py
parent6fa09650b8a936782aa9352e5e23001360317b9d (diff)
rtemstoolkit: Add unit testing for the python modules
- Add support to run the unit tests for the rtemstoolkit python modules from waf. Enter './waf test' for the tests to be run on python2 and python3. - Update the importing of rtemstoolkit modules to the standard method which works on python2 and python3. - Update the README.
Diffstat (limited to 'rtemstoolkit/options.py')
-rw-r--r--rtemstoolkit/options.py30
1 files changed, 8 insertions, 22 deletions
diff --git a/rtemstoolkit/options.py b/rtemstoolkit/options.py
index 77d9593..dcb8980 100644
--- a/rtemstoolkit/options.py
+++ b/rtemstoolkit/options.py
@@ -42,28 +42,14 @@ import os
import string
import sys
-#
-# Support to handle use in a package and as a unit test.
-# If there is a better way to let us know.
-#
-try:
- from . import error
- from . import execute
- from . import git
- from . import host
- from . import log
- from . import macros
- from . import path
- from . import version
-except (ValueError, SystemError):
- import error
- import execute
- import git
- import host
- import log
- import macros
- import path
- import version
+from rtemstoolkit import error
+from rtemstoolkit import execute
+from rtemstoolkit import git
+from rtemstoolkit import host
+from rtemstoolkit import log
+from rtemstoolkit import macros
+from rtemstoolkit import path
+from rtemstoolkit import version
basepath = 'tb'