Changeset 6db01e5 in rtems-tools


Ignore:
Timestamp:
Nov 28, 2018, 11:14:14 PM (6 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
650569c
Parents:
93821fe
git-author:
Chris Johns <chrisj@…> (11/28/18 23:14:14)
git-committer:
Chris Johns <chrisj@…> (11/28/18 23:16:44)
Message:

rtemstoolkit/host: Fix the darwin support.

  • Add python as a unit test variant.
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • rtemstoolkit/darwin.py

    r93821fe r6db01e5  
    5050def overrides():
    5151    uname = os.uname()
    52     ncpus = '%d' % (cores())
     52    ncpus = '%d' % (cpus())
    5353    defines = {
    5454        '_ncpus':         ('none',    'none',     ncpus),
     
    6464        '_var':           ('dir',     'optional', '/usr/local/var'),
    6565        '__ldconfig':     ('exe',     'none',     ''),
    66         '__cvs':          ('exe',     'required', 'cvs'),
    6766        '__xz':           ('exe',     'required', '%{_usr}/bin/xz'),
    6867        'with_zlib':      ('none',    'none',     '--with-zlib=no'),
  • rtemstoolkit/host.py

    r93821fe r6db01e5  
    5757            name = 'windows'
    5858        elif uname[0] == 'Darwin':
    59             name = darwin
     59            name = 'darwin'
    6060        elif uname[0] == 'FreeBSD':
    6161            name = 'freebsd'
    6262        elif uname[0] == 'NetBSD':
    63             name = netbsd
     63            name = 'netbsd'
    6464        elif uname[0] == 'Linux':
    6565            name = 'linux'
  • wscript

    r93821fe r6db01e5  
    101101    # Find which versions of python are installed for testing.
    102102    #
     103    ctx.find_program('python', mandatory = False)
    103104    ctx.find_program('python2', mandatory = False)
    104105    ctx.find_program('python3', mandatory = False)
     
    159160    ctx.logger = waflib.Logs.make_logger(log.abspath(), 'build')
    160161    failures = False
    161     for py in ['2', '3']:
    162         PY = 'PYTHON%s' % (py)
    163         if PY in ctx.env:
    164             from rtemstoolkit import all as toolkit_tests
    165             from rtemstoolkit import args as toolkit_test_args
    166             for tt in toolkit_tests:
     162    from rtemstoolkit import all as toolkit_tests
     163    from rtemstoolkit import args as toolkit_test_args
     164    for tt in toolkit_tests:
     165        for py in ['', '2', '3']:
     166            PY = 'PYTHON%s' % (py)
     167            if PY in ctx.env:
    167168                test = 'rtemstoolkit.%s' % (tt)
    168169                ctx.start_msg('Test python%s %s' % (py, test))
Note: See TracChangeset for help on using the changeset viewer.