Changeset 9600c39 in rtems-tools for tester


Ignore:
Timestamp:
Feb 8, 2015, 7:14:16 AM (5 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.11, master
Children:
05fe73d
Parents:
b7d48ef
Message:

Fixes to the run the waf built tests when installed.

Location:
tester
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • tester/rt/gdb.py

    rb7d48ef r9600c39  
    210210                print 'gdb done', ec
    211211            if ec > 0:
    212                 raise error.general('gdb exec: %s' % (os.strerror(ec)))
     212                raise error.general('gdb exec: %s: %s' % (cmds[0], os.strerror(ec)))
    213213        except:
    214214            raise
  • tester/rt/options.py

    rb7d48ef r9600c39  
    11#
    22# RTEMS Tools Project (http://www.rtems.org/)
    3 # Copyright 2013-2014 Chris Johns (chrisj@rtems.org)
     3# Copyright 2013-2015 Chris Johns (chrisj@rtems.org)
    44# All rights reserved.
    55#
     
    9090    # have been installed and the defaults is in the install prefix.
    9191    #
    92     print path.join(command_path, defaults_mc)
    9392    if path.exists(path.join(command_path, defaults_mc)):
    9493        rtdir = command_path
  • tester/rt/test.py

    rb7d48ef r9600c39  
    6666        self.opts.defaults['test_executable'] = executable
    6767        if rtems_tools:
    68             rtems_tools_bin = path.join(rtems_tools, 'bin')
     68            rtems_tools_bin = path.join(self.opts.defaults.expand(rtems_tools), 'bin')
    6969            if not path.isdir(rtems_tools_bin):
    7070                raise error.general('cannot find RTEMS tools path: %s' % (rtems_tools_bin))
     
    220220        rtems_tools = opts.find_arg('--rtems-tools')
    221221        if rtems_tools:
     222            if len(rtems_tools) != 2:
     223                raise error.general('invalid RTEMS tools option')
    222224            rtems_tools = rtems_tools[1]
     225        else:
     226            rtems_tools = '%{_prefix}'
    223227        bsp = opts.find_arg('--rtems-bsp')
    224         if bsp is None:
    225             raise error.general('no RTEMS BSP provided')
     228        if bsp is None or len(bsp) != 2:
     229            raise error.general('RTEMS BSP not provided or invalid option')
    226230        opts.defaults.load('%%{_configdir}/bsps/%s.mc' % (bsp[1]))
    227231        bsp = opts.defaults.get('%{bsp}')
  • tester/rtems/testing/defaults.mc

    rb7d48ef r9600c39  
    11#
    22# RTEMS Tools Project (http://www.rtems.org/)
    3 # Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
     3# Copyright 2010-2015 Chris Johns (chrisj@rtems.org)
    44# All rights reserved.
    55#
     
    5151
    5252# Paths
    53 _topdir:             dir,     required, '%{_cwd}'
     53_topdir:             dir,     required, '%{_prefix}'
    5454_docdir:             dir,     none,     '%{_defaultdocdir}'
    5555_tmppath:            dir,     none,     '%{_topdir}/build/tmp'
  • tester/wscript

    rb7d48ef r9600c39  
    7373    # Install the tester configuration files.
    7474    #
    75     config = bld.path.find_dir('rtems')
     75    config = bld.path.find_dir('config')
     76    bld.install_files('${PREFIX}/share/rtems/tester/config',
     77                      config.ant_glob('**/*'), cwd = config,
     78                      relative_trick = True)
     79    rtems = bld.path.find_dir('rtems')
    7680    bld.install_files('${PREFIX}/share/rtems/tester/rtems',
    77                       config.ant_glob('**', excl=['*~']),
    78                       cwd = config,
     81                      rtems.ant_glob('**/*'), cwd = rtems,
    7982                      relative_trick = True)
    8083
Note: See TracChangeset for help on using the changeset viewer.