Changeset 0382b68 in rtems-tools for tester


Ignore:
Timestamp:
Oct 18, 2015, 8:19:08 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, master
Children:
bd94415
Parents:
2f11c36
git-author:
Chris Johns <chrisj@…> (10/18/15 08:19:08)
git-committer:
Chris Johns <chrisj@…> (10/18/15 22:06:49)
Message:

Fix Windows build issues.

Fix biulding the mmap Windows code.
Fix installing the files for Windows.

Location:
tester
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • tester/rt/console.py

    r2f11c36 r0382b68  
    3434
    3535import errno
    36 import fcntl
    3736import os
    3837import threading
    3938import time
    4039
    41 import stty
     40#
     41# Not available on Windows. Not sure what this means.
     42#
     43if os.name != 'nt':
     44    import fcntl
     45    import stty
     46else:
     47    fcntl = None
     48    stty = None
    4249
    4350def save():
    44     return stty.save()
     51    if stty is not None:
     52        return stty.save()
     53    return None
    4554
    4655def restore(attributes):
    47     stty.restore(attributes)
     56    if attributes is not None and stty is not None:
     57        stty.restore(attributes)
    4858
    4959class console(object):
     
    92102        if self._tracing():
    93103            print ':: tty close', self.dev
    94         fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
    95                     fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) & ~os.O_NONBLOCK)
     104        if fcntl is not None:
     105            fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
     106                        fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) & ~os.O_NONBLOCK)
    96107        self.close()
    97108
     
    100111            if self._tracing():
    101112                print ':: tty runner started', self.dev
    102             fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
    103                         fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) | os.O_NONBLOCK)
     113            if fcntl is not None:
     114                fcntl.fcntl(me.tty.fd, fcntl.F_SETFL,
     115                            fcntl.fcntl(me.tty.fd, fcntl.F_GETFL) | os.O_NONBLOCK)
    104116            line = ''
    105117            while me.running:
  • tester/rt/gdb.py

    r2f11c36 r0382b68  
    3636import Queue
    3737import sys
    38 import termios
    3938import threading
    4039
  • tester/rtems-test

    r2f11c36 r0382b68  
    3434parent = os.path.dirname(base)
    3535rtems = os.path.join(parent, 'share', 'rtems')
    36 sys.path = [base, parent, rtems] + sys.path
     36tester = os.path.join(parent, 'share', 'rtems', 'tester')
     37sys.path = [parent, rtems, tester] + sys.path
    3738
    3839try:
  • tester/wscript

    r2f11c36 r0382b68  
    6161                  'rt/test.py',
    6262                  'rt/version.py'],
    63         install_path = '${PREFIX}/share/rtems/rt')
     63        install_path = '${PREFIX}/share/rtems/tester')
    6464    bld(features = 'py',
    6565        source = ['rt/pygdb/__init__.py',
    6666                  'rt/pygdb/mi_parser.py',
    6767                  'rt/pygdb/spark.py'],
    68         install_path = '${PREFIX}/share/rtems/rt/pygdb')
     68        install_path = '${PREFIX}/share/rtems/tester')
    6969    bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755)
    7070
Note: See TracChangeset for help on using the changeset viewer.