diff options
| author | Chris Johns <chrisj@rtems.org> | 2015-12-09 20:08:19 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2015-12-09 20:08:19 +1100 |
| commit | efc4f099b459833cc424f133716824bc0efc060e (patch) | |
| tree | 683f0eb50e7bcb1f67175fc96d08228740b959ba /tester | |
| parent | Add gitattributes to aid releasing. (diff) | |
| download | rtems-tools-efc4f099b459833cc424f133716824bc0efc060e.tar.bz2 | |
Add release versioning support.
Support a top level VERSION file that defines an RTEMS release.
Fix the install of the python modules including thertems-test.
Update the git python module to the RSB version. Fix the options to
not call clean and to call dirty.
Update the version python module.
Fix the rtld C++ support to the VERSION file and the top level waf
script.
Diffstat (limited to 'tester')
| -rw-r--r-- | tester/rt/test.py | 4 | ||||
| -rwxr-xr-x | tester/rtems-test | 5 | ||||
| -rw-r--r-- | tester/wscript | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/tester/rt/test.py b/tester/rt/test.py index ff211d2..fee39e3 100644 --- a/tester/rt/test.py +++ b/tester/rt/test.py @@ -39,13 +39,13 @@ from rtemstoolkit import error from rtemstoolkit import log from rtemstoolkit import path from rtemstoolkit import stacktraces +from rtemstoolkit import version import bsps import config import console import options import report -import version import fnmatch class test(object): @@ -201,7 +201,7 @@ def run(command_path = None): opts = options.load(sys.argv, optargs = optargs, command_path = command_path) - log.notice('RTEMS Testing - Tester, v%s' % (version.str())) + log.notice('RTEMS Testing - Tester, %s' % (version.str())) if opts.find_arg('--list-bsps'): bsps.list(opts) exe_filter = opts.find_arg('--filter') diff --git a/tester/rtems-test b/tester/rtems-test index 6f80df2..32ec563 100755 --- a/tester/rtems-test +++ b/tester/rtems-test @@ -1,7 +1,7 @@ #! /usr/bin/env python # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2013 Chris Johns (chrisj@rtems.org) +# Copyright 2013, 2015 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -33,8 +33,7 @@ import sys, os base = os.path.dirname(os.path.abspath(sys.argv[0])) parent = os.path.dirname(base) rtems = os.path.join(parent, 'share', 'rtems') -tester = os.path.join(parent, 'share', 'rtems', 'tester') -sys.path = [parent, rtems, tester] + sys.path +sys.path = [rtems, os.path.join(rtems, 'tester')] + sys.path try: import rt.test diff --git a/tester/wscript b/tester/wscript index 794d25f..56d0337 100644 --- a/tester/wscript +++ b/tester/wscript @@ -42,6 +42,8 @@ def configure(conf): recurse(conf) conf.load('python') conf.check_python_version((2,6,6)) + conf.env['PYO'] = 0 + conf.env['PYC'] = 0 def build(bld): recurse(bld) @@ -60,12 +62,12 @@ def build(bld): 'rt/stty.py', 'rt/test.py', 'rt/version.py'], - install_path = '${PREFIX}/share/rtems/tester') + install_path = '${PREFIX}/share/rtems') bld(features = 'py', source = ['rt/pygdb/__init__.py', 'rt/pygdb/mi_parser.py', 'rt/pygdb/spark.py'], - install_path = '${PREFIX}/share/rtems/tester') + install_path = '${PREFIX}/share/rtems') bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755) # |