tester: Refactor to use INI format files for BSP configurations.

- Add support for user condfigurations files with the --user-config.
- Add support for a $HOME/.rtemstesterrc for a user configuration.

Closes #3204.

105 files changed, 1577 insertions, 2588 deletions

diff --git a/rtemstoolkit/configuration.py b/rtemstoolkit/configuration.py
index 71ab3ca..a03b4cc 100644
--- a/rtemstoolkit/configuration.py
+++ b/rtemstoolkit/configuration.py
@@ -36,6 +36,7 @@ from __future__ import print_function
 
 import os
 import re
+import yaml
 
 try:
     import configparser
@@ -52,6 +53,23 @@ class configuration:
         self.ini = None
         self.macro_filter = re.compile('\$\{.+\}')
 
+    def __str__(self):
+        if self.ini is None:
+            return 'empty'
+        s = ['Base: %s' % (self.ini['base'])]
+        s += ['Files:']
+        for f in self.ini['files']:
+            s += [' %s' % (f)]
+        s += ['Defaults:']
+        for default in self.config.defaults():
+            s += ' ' + default
+        s += ['Sections:']
+        for section in self.config.sections():
+            s += [' [%s]' % (section)]
+            for option in self.config.options(section):
+                s += ['  %s = %s' % (option, self.config.get(section, option))]
+        return os.linesep.join(s)
+
     def get_item(self, section, label, err = True):
         try:
             rec = self.config.get(section, label).replace(os.linesep, ' ')
@@ -78,10 +96,14 @@ class configuration:
                 pass
         return rec
 
-    def get_items(self, section, err = True):
+    def get_items(self, section, err = True, flatten = True):
         try:
-            items = [(name, key.replace(os.linesep, ' ')) \
-                     for name, key in self.config.items(section)]
+            items = []
+            for name, key in self.config.items(section):
+                if flatten:
+                    items += [(name, key.replace(os.linesep, ' '))]
+                else:
+                    items += [(name, key)]
             return items
         except:
             if err:
@@ -102,6 +124,9 @@ class configuration:
                 raise error.general('config: section "%s" not found' % (section))
         return []
 
+    def has_section(self, section):
+        return self.config.has_section(section)
+
     def load(self, name):
         #
         # Load all the files.
@@ -132,6 +157,5 @@ class configuration:
                 for section in self.config.sections():
                     includes += self.comma_list(section, 'include', err = False)
 
-
     def files(self):
         return self.ini['files']
diff --git a/rtemstoolkit/macros.py b/rtemstoolkit/macros.py
index 31f5a7e..ed8cd96 100644
--- a/rtemstoolkit/macros.py
+++ b/rtemstoolkit/macros.py
@@ -134,18 +134,19 @@ class macros:
         for f in self.files:
             text += '> %s%s' % (f, os.linesep)
         for map in self.macros:
-            if map in self.read_maps:
-                if self.read_map_locked:
-                    rm = 'R'
-                else:
-                    rm = 'r'
-            else:
-                rm = '-'
+            rm = '-'
+            for rmap in self.read_maps:
+                if rmap[4:] == '___%s' % (map):
+                    if self.read_map_locked:
+                        rm = 'R[%s]' % (rmap[:4])
+                    else:
+                        rm = 'r[%s]' % (rmap[:4])
+                    break
             if map == self.write_map:
                 wm = 'w'
             else:
                 wm = '-'
-            text += '[%s] %s%s%s' % (map, rm, wm, os.linesep)
+            text += '[%s] %s,%s%s' % (map, wm, rm, os.linesep)
             for k in sorted(self.macros[map].keys()):
                 d = self.macros[map][k]
                 text += " %s:%s '%s'%s '%s'%s" % \
@@ -250,7 +251,7 @@ class macros:
         return self.macros.keys()
 
     def get_read_maps(self):
-        return [rm[5:] for rm in self.read_maps]
+        return [rm[7:] for rm in self.read_maps]
 
     def key_filter(self, key):
         if key.startswith('%{') and key[-1] is '}':
@@ -493,7 +494,7 @@ class macros:
         if not self.read_map_locked:
             if _map in self.macros:
                 if _map not in self.get_read_maps():
-                    rm = '%04d_%s' % (len(self.read_maps), _map)
+                    rm = '%04d___%s' % (len(self.read_maps), _map)
                     self.read_maps = sorted(self.read_maps + [rm])
                 return True
         return False
@@ -502,17 +503,25 @@ class macros:
         if not self.read_map_locked:
             if _map in self.get_read_maps():
                 for i in range(0, len(self.read_maps)):
-                    if '%04d_%s' % (i, _map) == self.read_maps[i]:
+                    if '%04d___%s' % (i, _map) == self.read_maps[i]:
                         self.read_maps.pop(i)
                 return True
         return False
 
-    def set_write_map(self, map):
-        if map in self.macros:
-            self.write_map = map
+    def set_write_map(self, _map, add = False):
+        if _map in self.macros:
+            self.write_map = _map
+            return True
+        elif add:
+            self.write_map = _map
+            self.macros[_map] = {}
             return True
         return False
 
+    def unset_write_map(self):
+        self.write_map = 'global'
+        return True
+
     def lock_read_map(self):
         self.read_map_locked = True
 
diff --git a/rtemstoolkit/path.py b/rtemstoolkit/path.py
index 15dad1b..760f4bd 100644
--- a/rtemstoolkit/path.py
+++ b/rtemstoolkit/path.py
@@ -153,7 +153,6 @@ def removeall(path):
 
     path = host(path)
     shutil.rmtree(path, onerror = _onerror)
-    return
 
 def expand(name, paths):
     l = []
@@ -161,6 +160,11 @@ def expand(name, paths):
         l += [join(p, name)]
     return l
 
+def expanduser(path):
+    path = host(path)
+    path = os.path.expanduser(path)
+    return shell(path)
+
 def collect_files(path_):
     #
     # Convert to shell paths and return shell paths.
diff --git a/tester/rt/config.py b/tester/rt/config.py
index 80defdd..b1a9b79 100644
--- a/tester/rt/config.py
+++ b/tester/rt/config.py
@@ -127,16 +127,18 @@ class file(config.file):
             if fexe is not None and '@FEXE@' in cmd:
                 cmd = cmd.replace('@FEXE@', exe)
             if len(cmd) > 0:
-                rs_proc = execute.capture_execution()
-                ec, proc, output = rs_proc.open(cmd, shell = True)
+                output = ''
+                if not self.opts.dry_run():
+                    rs_proc = execute.capture_execution()
+                    ec, proc, output = rs_proc.open(cmd, shell = True)
                 self._capture_console('target %s: %s' % (command, cmd))
                 if len(output) > 0:
                     output = os.linesep.join([' ' + l for l in output.splitlines()])
                     self._capture_console(output)
 
     def _target_exe_filter(self, exe):
-        if self.defined('target_exe_filter_command'):
-            f = self.expand('%{target_exe_filter_command}').strip()
+        if self.defined('target_exe_filter'):
+            f = self.expand('%{target_exe_filter}').strip()
             # Be like sed and use the first character as the delmiter.
             if len(f) > 0:
                 delimiter = f[0]
@@ -191,37 +193,39 @@ class file(config.file):
         if len(data) == 0:
             raise error.general(self._name_line_msg('no console configuration provided'))
         console_trace = trace = self.debug_trace('console')
-        if data[0] == 'stdio':
-            self.console = console.stdio(trace = console_trace)
-        elif data[0] == 'tty':
-            if len(data) < 2 or len(data) >3:
-                raise error.general(self._name_line_msg('no tty configuration provided'))
-            if len(data) == 3:
-                settings = data[2]
+        if not self.opts.dry_run():
+            if data[0] == 'stdio':
+                self.console = console.stdio(trace = console_trace)
+            elif data[0] == 'tty':
+                if len(data) < 2 or len(data) >3:
+                    raise error.general(self._name_line_msg('no tty configuration provided'))
+                if len(data) == 3:
+                    settings = data[2]
+                else:
+                    settings = None
+                self.console = console.tty(data[1],
+                                           output = self.capture,
+                                           setup = settings,
+                                           trace = console_trace)
             else:
-                settings = None
-            self.console = console.tty(data[1],
-                                       output = self.capture,
-                                       setup = settings,
-                                       trace = console_trace)
-        else:
-            raise error.general(self._name_line_msg('invalid console type'))
+                raise error.general(self._name_line_msg('invalid console type'))
 
     def _dir_execute(self, data, total, index, exe, bsp_arch, bsp):
         self.process = execute.execute(output = self.capture)
+        if self.console:
+            self.console.open()
         if not self.in_error:
-            if self.console:
-                self.console.open()
             self.capture_console('run: %s' % (' '.join(data)))
-            ec, proc = self.process.open(data,
-                                         timeout = (int(self.expand('%{timeout}')),
-                                                    self._timeout))
-            self._lock()
-            if not self.kill_good and ec > 0:
-                self._error('execute failed: %s: exit-code:%d' % (' '.join(data), ec))
-            elif self.timedout:
-                self.process.kill()
-            self._unlock()
+            if not self.opts.dry_run():
+                ec, proc = self.process.open(data,
+                                             timeout = (int(self.expand('%{timeout}')),
+                                                        self._timeout))
+                self._lock()
+                if not self.kill_good and ec > 0:
+                    self._error('execute failed: %s: exit-code:%d' % (' '.join(data), ec))
+                elif self.timedout:
+                    self.process.kill()
+                self._unlock()
             if self.console:
                 self.console.close()
 
@@ -237,11 +241,12 @@ class file(config.file):
         if not self.in_error:
             if self.console:
                 self.console.open()
-            self.process.open(data[0], data[1],
-                              script = script,
-                              output = self.capture,
-                              gdb_console = self.capture_console,
-                              timeout = int(self.expand('%{timeout}')))
+            if not self.opts.dry_run():
+                self.process.open(data[0], data[1],
+                                  script = script,
+                                  output = self.capture,
+                                  gdb_console = self.capture_console,
+                                  timeout = int(self.expand('%{timeout}')))
             if self.console:
                 self.console.close()
 
@@ -253,19 +258,20 @@ class file(config.file):
         except:
             raise error.general('invalid %tftp port')
         self.kill_on_end = True
-        self.process = tftp.tftp(bsp_arch, bsp,
-                                 trace = self.debug_trace('gdb'))
-        if not self.in_error:
-            if self.console:
-                self.console.open()
-            self.process.open(executable = exe,
-                              port = port,
-                              output_length = self._output_length,
-                              console = self.capture_console,
-                              timeout = (int(self.expand('%{timeout}')),
-                                         self._timeout))
-            if self.console:
-                self.console.close()
+        if not self.opts.dry_run():
+            self.process = tftp.tftp(bsp_arch, bsp,
+                                     trace = self.debug_trace('tftp'))
+            if not self.in_error:
+                if self.console:
+                    self.console.open()
+                self.process.open(executable = exe,
+                                  port = port,
+                                  output_length = self._output_length,
+                                  console = self.capture_console,
+                                  timeout = (int(self.expand('%{timeout}')),
+                                             self._timeout))
+                if self.console:
+                    self.console.close()
 
     def _directive_filter(self, results, directive, info, data):
         if results[0] == 'directive':
@@ -287,7 +293,7 @@ class file(config.file):
                     total = int(self.expand('%{test_total}'))
                     index = int(self.expand('%{test_index}'))
                     exe = self.expand('%{test_executable}')
-                    bsp_arch = self.expand('%{bsp_arch}')
+                    bsp_arch = self.expand('%{arch}')
                     bsp = self.expand('%{bsp}')
                     fexe = self._target_exe_filter(exe)
                     self.report.start(index, total, exe, fexe, bsp_arch, bsp)
diff --git a/tester/rt/report.py b/tester/rt/report.py
index 03a2a47..8f266d1 100644
--- a/tester/rt/report.py
+++ b/tester/rt/report.py
@@ -98,7 +98,7 @@ class report(object):
         self.results[name] = { 'index': index,
                                'bsp': bsp,
                                'bsp_arch': bsp_arch,
-                               'exe': executable,
+                               'exe': name,
                                'start': datetime.datetime.now(),
                                'end': None,
                                'result': None,
diff --git a/tester/rt/test.py b/tester/rt/test.py
index bfc0f5f..575c2a1 100644
--- a/tester/rt/test.py
+++ b/tester/rt/test.py
@@ -39,6 +39,7 @@ import sys
 import threading
 import time
 
+from rtemstoolkit import configuration
 from rtemstoolkit import error
 from rtemstoolkit import log
 from rtemstoolkit import path
@@ -95,8 +96,7 @@ class test(object):
         self.opts.defaults['test_index'] = str(index)
         self.opts.defaults['test_total'] = str(total)
         self.opts.defaults['bsp'] = bsp
-        self.opts.defaults['bsp_arch'] = '%%{%s_arch}' % (bsp)
-        self.opts.defaults['bsp_opts'] = '%%{%s_opts}' % (bsp)
+        self.opts.defaults['bsp_arch'] = '%{arch}'
         if not path.isfile(executable):
             raise error.general('cannot find executable: %s' % (executable))
         self.opts.defaults['test_executable'] = executable
@@ -198,6 +198,52 @@ def report_finished(reports, report_mode, reporting, finished, job_trace):
                     print('}} ', t.name)
     return reporting
 
+def load_configuration(bsp, opts):
+    mandatory = ['tester', 'arch']
+    cfg = configuration.configuration()
+    path_ = opts.defaults.expand('%%{_configdir}/bsps/%s.ini' % (bsp))
+    ini_name = path.basename(path_)
+    for p in path.dirname(path_).split(':'):
+        if path.exists(path.join(p, ini_name)):
+            cfg.load(path.join(p, ini_name))
+            if not cfg.has_section(bsp):
+                raise error.general('bsp section not found in ini: [%s]' % (bsp))
+            item_names = cfg.get_item_names(bsp, err = False)
+            for m in mandatory:
+                if m not in item_names:
+                    raise error.general('mandatory item not found in bsp section: %s' % (m))
+            opts.defaults.set_write_map(bsp, add = True)
+            for i in cfg.get_items(bsp, flatten = False):
+                opts.defaults[i[0]] = i[1]
+            opts.defaults['bsp'] = bsp
+            if not opts.defaults.set_read_map(bsp):
+                raise error.general('cannot set BSP read map: %s' % (bsp))
+            # Get a copy of the required fields we need
+            requires = cfg.comma_list(bsp, 'requires', err = False)
+            del cfg
+            user_config = opts.find_arg('--user-config')
+            if user_config is not None:
+                user_config = path.expanduser(user_config[1])
+                if not path.exists(user_config):
+                    raise error.general('cannot find user configuration file: %s' % (user_config))
+            else:
+                if 'HOME' in os.environ:
+                    user_config = path.join(os.environ['HOME'], '.rtemstesterrc')
+            if user_config:
+                if path.exists(user_config):
+                    cfg = configuration.configuration()
+                    cfg.load(user_config)
+                    if cfg.has_section(bsp):
+                        for i in cfg.get_items(bsp, flatten = False):
+                            opts.defaults[i[0]] = i[1]
+                        # Check for the required values.
+                        for r in requires:
+                            if opts.defaults.get(r) is None:
+                                raise error.general('user value missing, BSP %s requires: %s' % \
+                                                    (bsp, ', '.join(requires)))
+            return
+    raise error.general('cannot find bsp configuration file: %s.ini' % (bsp))
+
 def _job_trace(tst, msg, total, exe, active, reporting):
     s = ''
     for a in active:
@@ -228,6 +274,7 @@ def run(command_path = None):
     try:
         optargs = { '--rtems-tools': 'The path to the RTEMS tools',
                     '--rtems-bsp':   'The RTEMS BSP to run the test on',
+                    '--user-config': 'Path to your local user configuration INI file',
                     '--report-mode': 'Reporting modes, failures (default),all,none',
                     '--list-bsps':   'List the supported BSPs',
                     '--debug-trace': 'Debug trace based on specific flags',
@@ -271,18 +318,10 @@ def run(command_path = None):
             rtems_tools = '%{_prefix}'
         bsp = opts.find_arg('--rtems-bsp')
         if bsp is None or len(bsp) != 2:
-            raise error.general('RTEMS BSP not provided or invalid option')
-        opts.defaults.load('%%{_configdir}/bsps/%s.mc' % (bsp[1]))
-        bsp = opts.defaults.get('%{bsp}')
-        if not bsp:
-            raise error.general('BSP definition (%{bsp}) not found in the global map')
-        bsp = bsp[2]
-        if not opts.defaults.set_read_map(bsp):
-            raise error.general('no BSP map found')
-        bsp_script = opts.defaults.get(bsp)
-        if not bsp_script:
-            raise error.general('BSP script not found: %s' % (bsp))
-        bsp_config = opts.defaults.expand(opts.defaults[bsp])
+            raise error.general('RTEMS BSP not provided or an invalid option')
+        bsp = bsp[1]
+        load_configuration(bsp, opts)
+        bsp_config = opts.defaults.expand(opts.defaults['tester'])
         report_mode = opts.find_arg('--report-mode')
         if report_mode:
             if report_mode[1] != 'failures' and \
diff --git a/tester/rtems/testing/bsps/arm1136jfs-run.mc b/tester/rtems/testing/bsps/arm1136jfs-run.ini
index e3711fa..276ca6f 100644
--- a/tester/rtems/testing/bsps/arm1136jfs-run.mc
+++ b/tester/rtems/testing/bsps/arm1136jfs-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The arm1136jfs BSP
 #
-[global]
-bsp:              none,    none,     'arm1136jfs'
-
 [arm1136jfs]
-arm1136jfs:              none,    none,     '%{_rtscripts}/run.cfg'
-arm1136jfs_arch:         none,    none,     'arm'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = arm
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm1136jfs.ini b/tester/rtems/testing/bsps/arm1136jfs.ini
new file mode 100644
index 0000000..cb8c0c2
--- /dev/null
+++ b/tester/rtems/testing/bsps/arm1136jfs.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The arm1136jfs BSP
+#
+[arm1136jfs]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = arm
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/arm1136jfs.mc b/tester/rtems/testing/bsps/arm1136jfs.mc
deleted file mode 100644
index 9eb0683..0000000
--- a/tester/rtems/testing/bsps/arm1136jfs.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The arm1136jfs BSP
-#
-[global]
-bsp:                 none,    none,     'arm1136jfs'
-
-[arm1136jfs]
-arm1136jfs:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-arm1136jfs_arch:            none,    none,     'arm'
-gdb_script:          none,    none,     'arm1136jfs_gdb_script'
-arm1136jfs_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/arm1136js-run.mc b/tester/rtems/testing/bsps/arm1136js-run.ini
index 774f55f..af889d4 100644
--- a/tester/rtems/testing/bsps/arm1136js-run.mc
+++ b/tester/rtems/testing/bsps/arm1136js-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The arm1136js BSP
 #
-[global]
-bsp:              none,    none,     'arm1136js'
-
 [arm1136js]
-arm1136js:              none,    none,     '%{_rtscripts}/run.cfg'
-arm1136js_arch:         none,    none,     'arm'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = arm
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm1136js.ini b/tester/rtems/testing/bsps/arm1136js.ini
new file mode 100644
index 0000000..68d787a
--- /dev/null
+++ b/tester/rtems/testing/bsps/arm1136js.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The arm1136js BSP
+#
+[arm1136js]
+arm1136js      = %{_rtscripts}/gdb.cfg
+arch           = arm
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/arm1136js.mc b/tester/rtems/testing/bsps/arm1136js.mc
deleted file mode 100644
index 4d75a0a..0000000
--- a/tester/rtems/testing/bsps/arm1136js.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The arm1136js BSP
-#
-[global]
-bsp:                 none,    none,     'arm1136js'
-
-[arm1136js]
-arm1136js:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-arm1136js_arch:            none,    none,     'arm'
-gdb_script:          none,    none,     'arm1136js_gdb_script'
-arm1136js_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/arm7tdmi-run.mc b/tester/rtems/testing/bsps/arm7tdmi-run.ini
index a11175f..efb30ab 100644
--- a/tester/rtems/testing/bsps/arm7tdmi-run.mc
+++ b/tester/rtems/testing/bsps/arm7tdmi-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The arm7tdmi BSP
 #
-[global]
-bsp:              none,    none,     'arm7tdmi'
-
 [arm7tdmi]
-arm7tdmi:              none,    none,     '%{_rtscripts}/run.cfg'
-arm7tdmi_arch:         none,    none,     'arm'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = arm
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm7tdmi.ini b/tester/rtems/testing/bsps/arm7tdmi.ini
new file mode 100644
index 0000000..2835bee
--- /dev/null
+++ b/tester/rtems/testing/bsps/arm7tdmi.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The arm7tdmi BSP
+#
+[arm7tdmi]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = arm
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/arm7tdmi.mc b/tester/rtems/testing/bsps/arm7tdmi.mc
deleted file mode 100644
index e13971d..0000000
--- a/tester/rtems/testing/bsps/arm7tdmi.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The arm7tdmi BSP
-#
-[global]
-bsp:                 none,    none,     'arm7tdmi'
-
-[arm7tdmi]
-arm7tdmi:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-arm7tdmi_arch:            none,    none,     'arm'
-gdb_script:          none,    none,     'arm7tdmi_gdb_script'
-arm7tdmi_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/arm920-run.mc b/tester/rtems/testing/bsps/arm920-run.ini
index 5358384..a904aae 100644
--- a/tester/rtems/testing/bsps/arm920-run.mc
+++ b/tester/rtems/testing/bsps/arm920-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The arm920 BSP
 #
-[global]
-bsp:              none,    none,     'arm920'
-
 [arm920]
-arm920:              none,    none,     '%{_rtscripts}/run.cfg'
-arm920_arch:         none,    none,     'arm'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = arm
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/arm920.ini b/tester/rtems/testing/bsps/arm920.ini
new file mode 100644
index 0000000..2f2dba3
--- /dev/null
+++ b/tester/rtems/testing/bsps/arm920.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The arm920 BSP
+#
+[arm920]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = arm
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/arm920.mc b/tester/rtems/testing/bsps/arm920.mc
deleted file mode 100644
index deeb17f..0000000
--- a/tester/rtems/testing/bsps/arm920.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The arm920 BSP
-#
-[global]
-bsp:                 none,    none,     'arm920'
-
-[arm920]
-arm920:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-arm920_arch:            none,    none,     'arm'
-gdb_script:          none,    none,     'arm920_gdb_script'
-arm920_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/armcortexa9-run.mc b/tester/rtems/testing/bsps/armcortexa9-run.ini
index 84829b0..c0964ab 100644
--- a/tester/rtems/testing/bsps/armcortexa9-run.mc
+++ b/tester/rtems/testing/bsps/armcortexa9-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The armcortexa9 BSP
 #
-[global]
-bsp:              none,    none,     'armcortexa9'
-
 [armcortexa9]
-armcortexa9:              none,    none,     '%{_rtscripts}/run.cfg'
-armcortexa9_arch:         none,    none,     'arm'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = arm
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/armcortexa9.ini b/tester/rtems/testing/bsps/armcortexa9.ini
new file mode 100644
index 0000000..6eb2321
--- /dev/null
+++ b/tester/rtems/testing/bsps/armcortexa9.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The armcortexa9 BSP
+#
+[armcortexa9]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = arm
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/armcortexa9.mc b/tester/rtems/testing/bsps/armcortexa9.mc
deleted file mode 100644
index 4b0c7f8..0000000
--- a/tester/rtems/testing/bsps/armcortexa9.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The armcortexa9 BSP
-#
-[global]
-bsp:                 none,    none,     'armcortexa9'
-
-[armcortexa9]
-armcortexa9:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-armcortexa9_arch:            none,    none,     'arm'
-gdb_script:          none,    none,     'armcortexa9_gdb_script'
-armcortexa9_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/beagleboardxm.ini b/tester/rtems/testing/bsps/beagleboardxm.ini
new file mode 100644
index 0000000..1d5b590
--- /dev/null
+++ b/tester/rtems/testing/bsps/beagleboardxm.ini
@@ -0,0 +1,41 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The BeagleBoard xM board connected via OpenOCD and a JTAG pod. The console
+# is connected to a tty device. The BeagleBoard xM BSP contains an OpenOCD
+# configuration file called bbxm.cfg you need to start OpenOCD with.
+#
+[beagleboardxm]
+jobs       = 1
+tester     = %{_rtscripts}/gdb.cfg
+arch       = arm
+gdb_script = bsp_gdb_script
+requires   = bsp_tty_dev, bsp_gdb_script
diff --git a/tester/rtems/testing/bsps/beagleboardxm.mc b/tester/rtems/testing/bsps/beagleboardxm.mc
deleted file mode 100644
index 2564db2..0000000
--- a/tester/rtems/testing/bsps/beagleboardxm.mc
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The BeagleBoard xM board connected via OpenOCD and a JTAG pod. The console
-# is connected to a tty device. The BeagleBoard xM BSP contains an OpenOCD
-# configuration file called bbxm.cfg you need to start OpenOCD with.
-#
-[global]
-bsp:                      none,    none,   'beagleboardxm'
-jobs:                     none,    none,   '1'
-
-[beagleboardxm]
-beagleboardxm:            none,    none,   '%{_rtscripts}/gdb.cfg'
-beagleboardxm_arch:       none,    none,   'arm'
-bsp_tty_dev:              none,    none,   '/dev/cuaU3'
-gdb_script:               none,    none,   'beagleboardxm_gdb_script'
-beagleboardxm_gdb_script: none,    none,   '''target remote kaka:3333
-                                              mon beagleboard_xm_mlo /home/chris/development/rtems/bb/uboot/u-boot/MLO
-                                              load
-                                              b _Terminate_CPU_Fatal_halt
-                                              continue'''
diff --git a/tester/rtems/testing/bsps/beagleboneblack.ini b/tester/rtems/testing/bsps/beagleboneblack.ini
new file mode 100644
index 0000000..5b3932d
--- /dev/null
+++ b/tester/rtems/testing/bsps/beagleboneblack.ini
@@ -0,0 +1,42 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The BeagleBone Black board connected via TFTP. The console is connected to a
+# telnet tty device.
+#
+[beagleboneblack]
+jobs               = 1
+tester             = %{_rtscripts}/tftp.cfg
+arch               = arm
+test_restarts      = 3
+target_reset_regex = ^No ethernet found.*|BOOTP broadcast 6.*|^ERROR: can.t get kernel image
+target_start_regex = ^U-Boot SPL .*
+requires           = bsp_tty_dev, target_on_command, target_off_command, target_reset_command
diff --git a/tester/rtems/testing/bsps/beagleboneblack.mc b/tester/rtems/testing/bsps/beagleboneblack.mc
deleted file mode 100644
index 8121438..0000000
--- a/tester/rtems/testing/bsps/beagleboneblack.mc
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The BeagleBone Black board connected via TFTP. The console is connected to a
-# telnet tty device.
-#
-[global]
-bsp:                       none,    none,   'beagleboneblack'
-jobs:                      none,    none,   '1'
-
-[beagleboneblack]
-beagleboneblack:           none,    none,   '%{_rtscripts}/tftp.cfg'
-beagleboneblack_arch:      none,    none,   'arm'
-test_restarts:             none,    none,   '3'
-target_on_command:         none,    none,   'wemo-reset CSEng3 0 && sleep 3 && wemo-reset CSEng3 -1'
-target_off_command:        none,    none,   'wemo-reset CSEng3 0'
-target_reset_command:      none,    none,   'wemo-reset CSEng3 5'
-target_reset_regex:        none,    none,   '^No ethernet found.*|BOOTP broadcast 6.*|^ERROR: can.t get kernel image'
-target_start_regex:        none,    none,   '^U-Boot SPL .*'
-bsp_tty_dev:               none,    none,   'tuke:30007'
diff --git a/tester/rtems/testing/bsps/bf537Stamp-run.mc b/tester/rtems/testing/bsps/bf537Stamp-run.ini
index 34ec769..b9ab03b 100644
--- a/tester/rtems/testing/bsps/bf537Stamp-run.mc
+++ b/tester/rtems/testing/bsps/bf537Stamp-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The bf537Stamp BSP
 #
-[global]
-bsp:              none,    none,     'bf537Stamp'
-
 [bf537Stamp]
-bf537Stamp:       none,    none,     '%{_rtscripts}/run.cfg'
-bf537Stamp_arch:  none,    none,     'bfin'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '--env operating --model bf537'
+tester       = %{_rtscripts}/run.cfg
+arch         = bfin
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = --env operating --model bf537
diff --git a/tester/rtems/testing/bsps/bf537Stamp.ini b/tester/rtems/testing/bsps/bf537Stamp.ini
new file mode 100644
index 0000000..ae687a5
--- /dev/null
+++ b/tester/rtems/testing/bsps/bf537Stamp.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The bf537Stamp BSP
+#
+[bf537Stamp]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = bfin
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim --env operating --model bf537
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/bf537Stamp.mc b/tester/rtems/testing/bsps/bf537Stamp.mc
deleted file mode 100644
index e7bc10c..0000000
--- a/tester/rtems/testing/bsps/bf537Stamp.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The bf537Stamp BSP
-#
-[global]
-bsp:                    none,    none,     'bf537Stamp'
-
-[bf537Stamp]
-bf537Stamp:             none,    none,     '%{_rtscripts}/gdb.cfg'
-bf537Stamp_arch:        none,    none,     'bfin'
-gdb_script:             none,    none,     'bf537Stamp_gdb_script'
-bf537Stamp_gdb_script:  none,    none,     '''target sim --env operating --model bf537
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/erc32-run.mc b/tester/rtems/testing/bsps/erc32-run.ini
index 13615c4..83800eb 100644
--- a/tester/rtems/testing/bsps/erc32-run.mc
+++ b/tester/rtems/testing/bsps/erc32-run.ini
@@ -29,26 +29,9 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The erc32 BSP
 #
-[global]
-bsp:              none,    none,     'erc32'
-
 [erc32]
-erc32:            none,    none,     '%{_rtscripts}/run.cfg'
-erc32_arch:       none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     ''
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
diff --git a/tester/rtems/testing/bsps/erc32-sis.mc b/tester/rtems/testing/bsps/erc32-sis.ini
index b71a604..63047c6 100644
--- a/tester/rtems/testing/bsps/erc32-sis.mc
+++ b/tester/rtems/testing/bsps/erc32-sis.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The erc32 BSP
 #
-[global]
-bsp:              none,    none,     'erc32'
-
 [erc32]
-erc32:            none,    none,     '%{_rtscripts}/run.cfg'
-erc32_arch:       none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis'
-bsp_run_opts:     none,    none,     '-nouartrx -r -tlim 600 s'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
+bsp_run_opts = -nouartrx -r -tlim 600 s
diff --git a/tester/rtems/testing/bsps/erc32.ini b/tester/rtems/testing/bsps/erc32.ini
new file mode 100644
index 0000000..021dbd8
--- /dev/null
+++ b/tester/rtems/testing/bsps/erc32.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The erc32 BSP
+#
+[erc32]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sparc
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/erc32.mc b/tester/rtems/testing/bsps/erc32.mc
deleted file mode 100644
index 57d772c..0000000
--- a/tester/rtems/testing/bsps/erc32.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The erc32 BSP
-#
-[global]
-bsp:                 none,    none,     'erc32'
-
-[erc32]
-erc32:               none,    none,     '%{_rtscripts}/gdb.cfg'
-erc32_arch:          none,    none,     'sparc'
-gdb_script:          none,    none,     'erc32_gdb_script'
-erc32_gdb_script:    none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/generic_or1k.mc b/tester/rtems/testing/bsps/generic_or1k.ini
index c5feffd..f17c66e 100644
--- a/tester/rtems/testing/bsps/generic_or1k.mc
+++ b/tester/rtems/testing/bsps/generic_or1k.ini
@@ -29,25 +29,9 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The generic_or1k BSP
 #
-[global]
-bsp:                      none,    none,     'generic_or1k'
-
 [generic_or1k]
-generic_or1k:      none,    none,  '%{_rtscripts}/qemu.cfg'
-generic_or1k_arch: none,    none,  'or32'
-generic_or1k_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -m 32M'
+tester        = %{_rtscripts}/qemu.cfg
+arch          = or32
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -m 32M
diff --git a/tester/rtems/testing/bsps/h8sxsim-run.mc b/tester/rtems/testing/bsps/h8sxsim-run.ini
index 29f338c..8a351d5 100644
--- a/tester/rtems/testing/bsps/h8sxsim-run.mc
+++ b/tester/rtems/testing/bsps/h8sxsim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The h8sxsim BSP
 #
-[global]
-bsp:              none,    none,     'h8sxsim'
-
 [h8sxsim]
-h8sxsim:              none,    none,     '%{_rtscripts}/run.cfg'
-h8sxsim_arch:         none,    none,     'h8300'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = h8300
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/h8sxsim.ini b/tester/rtems/testing/bsps/h8sxsim.ini
new file mode 100644
index 0000000..85fe9ce
--- /dev/null
+++ b/tester/rtems/testing/bsps/h8sxsim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The h8sxsim BSP
+#
+[h8sxsim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = h8300
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/h8sxsim.mc b/tester/rtems/testing/bsps/h8sxsim.mc
deleted file mode 100644
index 66e18f6..0000000
--- a/tester/rtems/testing/bsps/h8sxsim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The h8sxsim BSP
-#
-[global]
-bsp:                 none,    none,     'h8sxsim'
-
-[h8sxsim]
-h8sxsim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-h8sxsim_arch:            none,    none,     'h8300'
-gdb_script:          none,    none,     'h8sxsim_gdb_script'
-h8sxsim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/jmr3904-run.mc b/tester/rtems/testing/bsps/jmr3904-run.ini
index 1b9274e..0591697 100644
--- a/tester/rtems/testing/bsps/jmr3904-run.mc
+++ b/tester/rtems/testing/bsps/jmr3904-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The JMR3904 BSP
 #
-[global]
-bsp:              none,    none,     'jmr3904'
-
 [jmr3904]
-jmr3904:          none,    none,     '%{_rtscripts}/run.cfg'
-jmr3904_arch:     none,    none,     'mipstx39'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '--board=jmr3904'
+tester       = %{_rtscripts}/run.cfg
+arch         = mipstx39
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = --board=jmr3904
diff --git a/tester/rtems/testing/bsps/jmr3904.mc b/tester/rtems/testing/bsps/jmr3904.ini
index 55929c1..7588df6 100644
--- a/tester/rtems/testing/bsps/jmr3904.mc
+++ b/tester/rtems/testing/bsps/jmr3904.ini
@@ -29,28 +29,12 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The JMR3904 BSP
 #
-[global]
-bsp:                 none,    none,     'jmr3904'
-
 [jmr3904]
-jmr3904:             none,    none,     '%{_rtscripts}/gdb.cfg'
-jmr3904_arch:        none,    none,     'mipstx39'
-gdb_script:          none,    none,     'jmr3904_gdb_script'
-jmr3904_gdb_script:  none,    none,     '''target sim --board=jmr3904
-                                           load
-                                           run'''
+tester         = %{_rtscripts}/gdb.cfg
+arch           = mipstx39
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim --board=jmr3904
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/leon2-run.mc b/tester/rtems/testing/bsps/leon2-run.ini
index 7edede1..2ff5b20 100644
--- a/tester/rtems/testing/bsps/leon2-run.mc
+++ b/tester/rtems/testing/bsps/leon2-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The leon2 BSP
 #
-[global]
-bsp:              none,    none,     'leon2'
-
 [leon2]
-leon2:            none,    none,     '%{_rtscripts}/run.cfg'
-leon2_arch:       none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis'
-bsp_run_opts:     none,    none,     '-leon2'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
+bsp_run_opts = -leon2
diff --git a/tester/rtems/testing/bsps/leon2-sis.mc b/tester/rtems/testing/bsps/leon2-sis.ini
index 8854fd6..b1c8b1f 100644
--- a/tester/rtems/testing/bsps/leon2-sis.mc
+++ b/tester/rtems/testing/bsps/leon2-sis.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The leon2 BSP
 #
-[global]
-bsp:              none,    none,     'leon2'
-
 [leon2]
-leon2:            none,    none,     '%{_rtscripts}/run.cfg'
-leon2_arch:       none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis'
-bsp_run_opts:     none,    none,     '-leon2 -nouartrx -r -tlim 200 s'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
+bsp_run_opts = -leon2 -nouartrx -r -tlim 200 s
diff --git a/tester/rtems/testing/bsps/leon2.ini b/tester/rtems/testing/bsps/leon2.ini
new file mode 100644
index 0000000..a4186ba
--- /dev/null
+++ b/tester/rtems/testing/bsps/leon2.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The leon2 BSP
+#
+[leon2]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sparc
+gdb_script     = leon2_gdb_script
+bsp_gdb_script = target sim -leon2
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/leon2.mc b/tester/rtems/testing/bsps/leon2.mc
deleted file mode 100644
index 6b0ec99..0000000
--- a/tester/rtems/testing/bsps/leon2.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The leon2 BSP
-#
-[global]
-bsp:                 none,    none,     'leon2'
-
-[leon2]
-leon2:               none,    none,     '%{_rtscripts}/gdb.cfg'
-leon2_arch:          none,    none,     'sparc'
-gdb_script:          none,    none,     'leon2_gdb_script'
-leon2_gdb_script:    none,    none,     '''target sim -leon2
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/leon3-run.mc b/tester/rtems/testing/bsps/leon3-run.ini
index 6c25b21..6d844c7 100644
--- a/tester/rtems/testing/bsps/leon3-run.mc
+++ b/tester/rtems/testing/bsps/leon3-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The leon3 BSP
 #
-[global]
-bsp:              none,    none,     'leon3'
-
 [leon3]
-leon3:            none,    none,     '%{_rtscripts}/run.cfg'
-leon3_arch:       none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis'
-bsp_run_opts:     none,    none,     '-leon3'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
+bsp_run_opts = -leon3
diff --git a/tester/rtems/testing/bsps/leon3-sis.mc b/tester/rtems/testing/bsps/leon3-sis.ini
index 1d55044..e31a181 100644
--- a/tester/rtems/testing/bsps/leon3-sis.mc
+++ b/tester/rtems/testing/bsps/leon3-sis.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The leon3 BSP
 #
-[global]
-bsp:              none,    none,     'leon3'
-
 [leon3]
-leon3:            none,    none,     '%{_rtscripts}/run.cfg'
-leon3_arch:       none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis'
-bsp_run_opts:     none,    none,     '-leon3 -nouartrx -r -tlim 200 s'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-sis
+bsp_run_opts = -leon3 -nouartrx -r -tlim 200 s
diff --git a/tester/rtems/testing/bsps/leon3.ini b/tester/rtems/testing/bsps/leon3.ini
new file mode 100644
index 0000000..874129b
--- /dev/null
+++ b/tester/rtems/testing/bsps/leon3.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The leon3 BSP
+#
+[leon3]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sparc
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim -leon3
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/leon3.mc b/tester/rtems/testing/bsps/leon3.mc
deleted file mode 100644
index b4f7713..0000000
--- a/tester/rtems/testing/bsps/leon3.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The leon3 BSP
-#
-[global]
-bsp:                 none,    none,     'leon3'
-
-[leon3]
-leon3:               none,    none,     '%{_rtscripts}/gdb.cfg'
-leon3_arch:          none,    none,     'sparc'
-gdb_script:          none,    none,     'leon3_gdb_script'
-leon3_gdb_script:    none,    none,     '''target sim -leon3
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/leon3_tsim-run.mc b/tester/rtems/testing/bsps/leon3_tsim-run.ini
index bad5372..bbff25b 100644
--- a/tester/rtems/testing/bsps/leon3_tsim-run.mc
+++ b/tester/rtems/testing/bsps/leon3_tsim-run.ini
@@ -29,27 +29,11 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The LEON3 BSP on TSIM
 #
 #
-[global]
-bsp:              none,    none,     'leon3'
-
 [tsim_leon3]
-tsim_leon3:       none,    none,     '%{_rtscripts}/run.cfg'
-tsim_leon3_arch:  none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     'tsim-leon3'
-bsp_run_opts:     none,    none,     '-c %{_rtscripts}/bsps/leon3-tsim-cmds'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = tsim-leon3
+bsp_run_opts = -c %{_rtscripts}/bsps/leon3-tsim-cmds
diff --git a/tester/rtems/testing/bsps/leon3_tsim.ini b/tester/rtems/testing/bsps/leon3_tsim.ini
new file mode 100644
index 0000000..8d69f96
--- /dev/null
+++ b/tester/rtems/testing/bsps/leon3_tsim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The LEON3 BSP running on TSIM
+#
+[leon3_tsim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sparc
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target remote :1234
+                 load
+                 continue
diff --git a/tester/rtems/testing/bsps/leon3_tsim.mc b/tester/rtems/testing/bsps/leon3_tsim.mc
deleted file mode 100644
index 3e7b039..0000000
--- a/tester/rtems/testing/bsps/leon3_tsim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The LEON3 BSP running on TSIM
-#
-[global]
-bsp:                   none,    none,     'leon3_tsim'
-
-[leon3_tsim]
-leon3_tsim:             none,    none,     '%{_rtscripts}/gdb.cfg'
-leon3_tsim_arch:        none,    none,     'sparc'
-gdb_script:             none,    none,     'leon3_tsim_gdb_script'
-leon3_tsim_gdb_script:  none,    none,     '''target remote :1234
-                                           load
-                                           continue'''
diff --git a/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini b/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini
new file mode 100644
index 0000000..03b6570
--- /dev/null
+++ b/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.ini
@@ -0,0 +1,38 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The lm32_evr_gdbsim BSP
+#
+[lm32_evr_gdbsim]
+tester       = %{_rtscripts}/run.cfg
+arch         = lm32
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = --hw-file %{_rtscripts}/bsps/lm32_evr_gdbsim-device-tree --memory-region 0x08000000,0x4000000
diff --git a/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.mc b/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.mc
deleted file mode 100644
index 38853fd..0000000
--- a/tester/rtems/testing/bsps/lm32_evr_gdbsim-run.mc
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The lm32_evr_gdbsim BSP
-#
-[global]
-bsp:                  none,    none,     'lm32_evr_gdbsim'
-
-[lm32_evr_gdbsim]
-lm32_evr_gdbsim:      none,    none,     '%{_rtscripts}/run.cfg'
-lm32_evr_gdbsim_arch: none,    none,     'lm32'
-bsp_run_cmd:          none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:         none,    none,     '--hw-file %{_rtscripts}/bsps/lm32_evr_gdbsim-device-tree --memory-region 0x08000000,0x4000000'
diff --git a/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini b/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini
new file mode 100644
index 0000000..e8319a2
--- /dev/null
+++ b/tester/rtems/testing/bsps/lm32_evr_gdbsim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The lm32_evr_gdbsim BSP
+#
+[lm32_evr_gdbsim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = lm32
+gdb_script     = bdp_gdb_script
+bsp_gdb_script = tar sim --hw-file %{_rtscripts}/bsps/lm32_evr_gdbsim-device-tree --memory-region 0x08000000,0x4000000
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/lm32_evr_gdbsim.mc b/tester/rtems/testing/bsps/lm32_evr_gdbsim.mc
deleted file mode 100644
index 1fd9a81..0000000
--- a/tester/rtems/testing/bsps/lm32_evr_gdbsim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The lm32_evr_gdbsim BSP
-#
-[global]
-bsp:                        none,    none,     'lm32_evr_gdbsim'
-
-[lm32_evr_gdbsim]
-lm32_evr_gdbsim:            none,    none,     '%{_rtscripts}/gdb.cfg'
-lm32_evr_gdbsim_arch:       none,    none,     'lm32'
-gdb_script:                 none,    none,     'lm32_evr_gdbsim_gdb_script'
-lm32_evr_gdbsim_gdb_script: none,    none,     '''tar sim --hw-file %{_rtscripts}/bsps/lm32_evr_gdbsim-device-tree --memory-region 0x08000000,0x4000000
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/m32csim-run.mc b/tester/rtems/testing/bsps/m32csim-run.ini
index af77c17..a584660 100644
--- a/tester/rtems/testing/bsps/m32csim-run.mc
+++ b/tester/rtems/testing/bsps/m32csim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The m32csim BSP
 #
-[global]
-bsp:              none,    none,     'm32csim'
-
 [m32csim]
-m32csim:              none,    none,     '%{_rtscripts}/run.cfg'
-m32csim_arch:         none,    none,     'm32c'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = m32c
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/m32csim.ini b/tester/rtems/testing/bsps/m32csim.ini
new file mode 100644
index 0000000..b472efb
--- /dev/null
+++ b/tester/rtems/testing/bsps/m32csim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The m32csim BSP
+#
+[m32csim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = m32c
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/m32csim.mc b/tester/rtems/testing/bsps/m32csim.mc
deleted file mode 100644
index 8f41df1..0000000
--- a/tester/rtems/testing/bsps/m32csim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The m32csim BSP
-#
-[global]
-bsp:                 none,    none,     'm32csim'
-
-[m32csim]
-m32csim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-m32csim_arch:            none,    none,     'm32c'
-gdb_script:          none,    none,     'm32csim_gdb_script'
-m32csim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/mcf5235.ini b/tester/rtems/testing/bsps/mcf5235.ini
new file mode 100644
index 0000000..01ddce6
--- /dev/null
+++ b/tester/rtems/testing/bsps/mcf5235.ini
@@ -0,0 +1,38 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The Coldfire Axiom MCF5235 connected via BDM.
+#
+[mcf5235]
+jobs     = 1
+tester   = %{_rtscripts}/gdb.cfg
+arch     = m68k
+requires = bsp_tty_dev, gdb_script
diff --git a/tester/rtems/testing/bsps/mcf5235.mc b/tester/rtems/testing/bsps/mcf5235.mc
deleted file mode 100644
index f95fffb..0000000
--- a/tester/rtems/testing/bsps/mcf5235.mc
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The Xilinx Zync ZC706 board connected via OpenOCD and a JTAG pod. The console
-# is connected to a tty device.
-#
-[global]
-bsp:                none,    none,   'mcf5235'
-jobs:               none,    none,   '1'
-
-[mcf5235]
-mcf5235:            none,    none,   '%{_rtscripts}/gdb.cfg'
-mcf5235_arch:       none,    none,   'm68k'
-bsp_tty_dev:        none,    none,   '/dev/cuaU2'
-bsp_tty_settings:   none,    none,   'B19200,~BRKINT,IGNBRK,IGNCR,~ICANON,~ISIG,~IEXTEN,~ECHO,~CLOCAL,VMIN=1,VTIME=2'
-gdb_script:         none,    none,   'mcf5235_gdb_script'
-mcf5235_gdb_script: none,    none,   '''target remote | m68k-bdm-gdbserver pipe 003-005
-                                        thb *0xffe254c0
-                                        continue
-                                        load
-                                        b bsp_reset
-                                        continue'''
diff --git a/tester/rtems/testing/bsps/pc.ini b/tester/rtems/testing/bsps/pc.ini
new file mode 100644
index 0000000..1762f16
--- /dev/null
+++ b/tester/rtems/testing/bsps/pc.ini
@@ -0,0 +1,36 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+[pc]
+jobs          = 1
+tester        = %{_rtscripts}/tftp.cfg
+arch          = i386
+test_restarts = 3
+requires      = bsp_tty_dev, target_on_command, target_off_command, target_reset_command
diff --git a/tester/rtems/testing/bsps/pc.mc b/tester/rtems/testing/bsps/pc.mc
deleted file mode 100644
index aa4a829..0000000
--- a/tester/rtems/testing/bsps/pc.mc
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The Xilinx Zynq Zedboard and Microzed board connected via TFTP. The console
-# is connected to a telnet tty device.
-#
-[global]
-bsp:                       none,    none,   'pc'
-jobs:                      none,    none,   '1'
-
-[pc]
-pc:                        none,    none,   '%{_rtscripts}/tftp.cfg'
-pc_arch:                   none,    none,   'i386'
-test_restarts:             none,    none,   '3'
-target_on_command:         none,    none,   'wemo-reset CSEng2 0 && sleep 3 && wemo-reset CSEng2 -1'
-target_off_command:        none,    none,   'wemo-reset CSEng2 0'
-target_reset_command:      none,    none,   'wemo-reset CSEng2 1'
-bsp_tty_dev:               none,    none,   'tuke:30010'
diff --git a/tester/rtems/testing/bsps/psim-run.mc b/tester/rtems/testing/bsps/psim-run.ini
index d19d541..b9abebe 100644
--- a/tester/rtems/testing/bsps/psim-run.mc
+++ b/tester/rtems/testing/bsps/psim-run.ini
@@ -29,28 +29,12 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The PSIM BSP
 #
 # Warning: This is not working cleanly on MacOS. I am not sure why. The gdb version does work.
 #
-[global]
-bsp:              none,    none,     'psim'
-
 [psim]
-psim:             none,    none,     '%{_rtscripts}/run.cfg'
-psim_arch:        none,    none,     'powerpc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-f %{_rtscripts}/bsps/psim-device-tree'
+tester       = %{_rtscripts}/run.cfg
+arch         = powerpc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -f %{_rtscripts}/bsps/psim-device-tree
diff --git a/tester/rtems/testing/bsps/psim.ini b/tester/rtems/testing/bsps/psim.ini
new file mode 100644
index 0000000..2eb3d8b
--- /dev/null
+++ b/tester/rtems/testing/bsps/psim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The PSIM BSP
+#
+[psim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = powerpc
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim -f %{_rtscripts}/bsps/psim-device-tree
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/psim.mc b/tester/rtems/testing/bsps/psim.mc
deleted file mode 100644
index d3de821..0000000
--- a/tester/rtems/testing/bsps/psim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The PSIM BSP
-#
-[global]
-bsp:                 none,    none,     'psim'
-
-[psim]
-psim:                none,    none,     '%{_rtscripts}/gdb.cfg'
-psim_arch:           none,    none,     'powerpc'
-gdb_script:          none,    none,     'psim_gdb_script'
-psim_gdb_script:     none,    none,     '''target sim -f %{_rtscripts}/bsps/psim-device-tree
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/realview_pbx_a9_qemu.mc b/tester/rtems/testing/bsps/realview_pbx_a9_qemu.ini
index acc107c..49d758e 100644
--- a/tester/rtems/testing/bsps/realview_pbx_a9_qemu.mc
+++ b/tester/rtems/testing/bsps/realview_pbx_a9_qemu.ini
@@ -29,25 +29,9 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The Realview PBX A9 BSP.
 #
-[global]
-bsp:                       none,    none,  'realview_pbx_a9_qemu'
-
 [realview_pbx_a9_qemu]
-realview_pbx_a9_qemu:      none,    none,  '%{_rtscripts}/qemu.cfg'
-realview_pbx_a9_qemu_arch: none,    none,  'arm'
-realview_pbx_a9_qemu_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M realview-pbx-a9 -m 256M'
+tester        = %{_rtscripts}/qemu.cfg
+arch          = arm
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M realview-pbx-a9 -m 256M
diff --git a/tester/rtems/testing/bsps/simsh1-run.mc b/tester/rtems/testing/bsps/simsh1-run.ini
index 2defb72..1244cb3 100644
--- a/tester/rtems/testing/bsps/simsh1-run.mc
+++ b/tester/rtems/testing/bsps/simsh1-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The simsh1 BSP
 #
-[global]
-bsp:              none,    none,     'simsh1'
-
 [simsh1]
-simsh1:              none,    none,     '%{_rtscripts}/run.cfg'
-simsh1_arch:         none,    none,     'sh'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = sh
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh1.ini b/tester/rtems/testing/bsps/simsh1.ini
new file mode 100644
index 0000000..66da1bb
--- /dev/null
+++ b/tester/rtems/testing/bsps/simsh1.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The simsh1 BSP
+#
+[simsh1]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sh
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/simsh1.mc b/tester/rtems/testing/bsps/simsh1.mc
deleted file mode 100644
index 5c6bdaf..0000000
--- a/tester/rtems/testing/bsps/simsh1.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The simsh1 BSP
-#
-[global]
-bsp:                 none,    none,     'simsh1'
-
-[simsh1]
-simsh1:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-simsh1_arch:            none,    none,     'sh'
-gdb_script:          none,    none,     'simsh1_gdb_script'
-simsh1_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/simsh2-run.mc b/tester/rtems/testing/bsps/simsh2-run.ini
index 1b42af9..fa604b9 100644
--- a/tester/rtems/testing/bsps/simsh2-run.mc
+++ b/tester/rtems/testing/bsps/simsh2-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The simsh2 BSP
 #
-[global]
-bsp:              none,    none,     'simsh2'
-
 [simsh2]
-simsh2:              none,    none,     '%{_rtscripts}/run.cfg'
-simsh2_arch:         none,    none,     'sh'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = sh
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh2.ini b/tester/rtems/testing/bsps/simsh2.ini
new file mode 100644
index 0000000..5158e0f
--- /dev/null
+++ b/tester/rtems/testing/bsps/simsh2.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The simsh2 BSP
+#
+[simsh2]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sh
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/simsh2.mc b/tester/rtems/testing/bsps/simsh2.mc
deleted file mode 100644
index 3ad164d..0000000
--- a/tester/rtems/testing/bsps/simsh2.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The simsh2 BSP
-#
-[global]
-bsp:                 none,    none,     'simsh2'
-
-[simsh2]
-simsh2:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-simsh2_arch:            none,    none,     'sh'
-gdb_script:          none,    none,     'simsh2_gdb_script'
-simsh2_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/simsh2e-run.mc b/tester/rtems/testing/bsps/simsh2e-run.ini
index e04181a..112d95e 100644
--- a/tester/rtems/testing/bsps/simsh2e-run.mc
+++ b/tester/rtems/testing/bsps/simsh2e-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The simsh2e BSP
 #
-[global]
-bsp:              none,    none,     'simsh2e'
-
 [simsh2e]
-simsh2e:              none,    none,     '%{_rtscripts}/run.cfg'
-simsh2e_arch:         none,    none,     'sh'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = sh
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh2e.ini b/tester/rtems/testing/bsps/simsh2e.ini
new file mode 100644
index 0000000..f54515b
--- /dev/null
+++ b/tester/rtems/testing/bsps/simsh2e.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The simsh2e BSP
+#
+[simsh2e]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sh
+gdb_script     = simsh2e_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/simsh2e.mc b/tester/rtems/testing/bsps/simsh2e.mc
deleted file mode 100644
index e9e0c8b..0000000
--- a/tester/rtems/testing/bsps/simsh2e.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The simsh2e BSP
-#
-[global]
-bsp:                 none,    none,     'simsh2e'
-
-[simsh2e]
-simsh2e:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-simsh2e_arch:            none,    none,     'sh'
-gdb_script:          none,    none,     'simsh2e_gdb_script'
-simsh2e_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/simsh4-run.mc b/tester/rtems/testing/bsps/simsh4-run.ini
index 832dabd..e175126 100644
--- a/tester/rtems/testing/bsps/simsh4-run.mc
+++ b/tester/rtems/testing/bsps/simsh4-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The simsh4 BSP
 #
-[global]
-bsp:              none,    none,     'simsh4'
-
 [simsh4]
-simsh4:              none,    none,     '%{_rtscripts}/run.cfg'
-simsh4_arch:         none,    none,     'sh'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = sh
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/simsh4.ini b/tester/rtems/testing/bsps/simsh4.ini
new file mode 100644
index 0000000..1e80553
--- /dev/null
+++ b/tester/rtems/testing/bsps/simsh4.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The simsh4 BSP
+#
+[simsh4]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sh
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/simsh4.mc b/tester/rtems/testing/bsps/simsh4.mc
deleted file mode 100644
index fdaae81..0000000
--- a/tester/rtems/testing/bsps/simsh4.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The simsh4 BSP
-#
-[global]
-bsp:                 none,    none,     'simsh4'
-
-[simsh4]
-simsh4:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-simsh4_arch:            none,    none,     'sh'
-gdb_script:          none,    none,     'simsh4_gdb_script'
-simsh4_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/sis-run.mc b/tester/rtems/testing/bsps/sis-run.ini
index cbfcd27..0e037a1 100644
--- a/tester/rtems/testing/bsps/sis-run.mc
+++ b/tester/rtems/testing/bsps/sis-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The SIS BSP
 #
-[global]
-bsp:              none,    none,     'sis'
-
 [sis]
-sis:              none,    none,     '%{_rtscripts}/run.cfg'
-sis_arch:         none,    none,     'sparc'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = sparc
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/sis.ini b/tester/rtems/testing/bsps/sis.ini
new file mode 100644
index 0000000..e76b10a
--- /dev/null
+++ b/tester/rtems/testing/bsps/sis.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The SIS BSP
+#
+[sis]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = sparc
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim -a -nouartrx
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/sis.mc b/tester/rtems/testing/bsps/sis.mc
deleted file mode 100644
index 27e1558..0000000
--- a/tester/rtems/testing/bsps/sis.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The SIS BSP
-#
-[global]
-bsp:                 none,    none,     'sis'
-
-[sis]
-sis:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-sis_arch:            none,    none,     'sparc'
-gdb_script:          none,    none,     'sis_gdb_script'
-sis_gdb_script:      none,    none,     '''target sim -a -nouartrx
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/v850e1sim-run.mc b/tester/rtems/testing/bsps/v850e1sim-run.ini
index d5cc92e..97371d5 100644
--- a/tester/rtems/testing/bsps/v850e1sim-run.mc
+++ b/tester/rtems/testing/bsps/v850e1sim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The v850e1sim BSP
 #
-[global]
-bsp:              none,    none,     'v850e1sim'
-
 [v850e1sim]
-v850e1sim:              none,    none,     '%{_rtscripts}/run.cfg'
-v850e1sim_arch:         none,    none,     'v850'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = v850
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850e1sim.ini b/tester/rtems/testing/bsps/v850e1sim.ini
new file mode 100644
index 0000000..7800834
--- /dev/null
+++ b/tester/rtems/testing/bsps/v850e1sim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The v850e1sim BSP
+#
+[v850e1sim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = v850
+gdb_script     = gdb_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/v850e1sim.mc b/tester/rtems/testing/bsps/v850e1sim.mc
deleted file mode 100644
index ee70846..0000000
--- a/tester/rtems/testing/bsps/v850e1sim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The v850e1sim BSP
-#
-[global]
-bsp:                 none,    none,     'v850e1sim'
-
-[v850e1sim]
-v850e1sim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-v850e1sim_arch:            none,    none,     'v850'
-gdb_script:          none,    none,     'v850e1sim_gdb_script'
-v850e1sim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/v850e2sim-run.mc b/tester/rtems/testing/bsps/v850e2sim-run.ini
index 0f97c69..e3fd0d0 100644
--- a/tester/rtems/testing/bsps/v850e2sim-run.mc
+++ b/tester/rtems/testing/bsps/v850e2sim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The v850e2sim BSP
 #
-[global]
-bsp:              none,    none,     'v850e2sim'
-
 [v850e2sim]
-v850e2sim:              none,    none,     '%{_rtscripts}/run.cfg'
-v850e2sim_arch:         none,    none,     'v850'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = v850
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850e2sim.ini b/tester/rtems/testing/bsps/v850e2sim.ini
new file mode 100644
index 0000000..486c4f1
--- /dev/null
+++ b/tester/rtems/testing/bsps/v850e2sim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The v850e2sim BSP
+#
+[v850e2sim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = v850
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/v850e2sim.mc b/tester/rtems/testing/bsps/v850e2sim.mc
deleted file mode 100644
index 9191aa5..0000000
--- a/tester/rtems/testing/bsps/v850e2sim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The v850e2sim BSP
-#
-[global]
-bsp:                 none,    none,     'v850e2sim'
-
-[v850e2sim]
-v850e2sim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-v850e2sim_arch:            none,    none,     'v850'
-gdb_script:          none,    none,     'v850e2sim_gdb_script'
-v850e2sim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/v850e2v3sim-run.mc b/tester/rtems/testing/bsps/v850e2v3sim-run.ini
index 7ff346c..a1d9c73 100644
--- a/tester/rtems/testing/bsps/v850e2v3sim-run.mc
+++ b/tester/rtems/testing/bsps/v850e2v3sim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The v850e2v3sim BSP
 #
-[global]
-bsp:              none,    none,     'v850e2v3sim'
-
 [v850e2v3sim]
-v850e2v3sim:              none,    none,     '%{_rtscripts}/run.cfg'
-v850e2v3sim_arch:         none,    none,     'v850'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = v850
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850e2v3sim.ini b/tester/rtems/testing/bsps/v850e2v3sim.ini
new file mode 100644
index 0000000..0d95eec
--- /dev/null
+++ b/tester/rtems/testing/bsps/v850e2v3sim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The v850e2v3sim BSP
+#
+[v850e2v3sim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = v850
+gdb_script     = v850e2v3sim_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/v850e2v3sim.mc b/tester/rtems/testing/bsps/v850e2v3sim.mc
deleted file mode 100644
index 4a2b11a..0000000
--- a/tester/rtems/testing/bsps/v850e2v3sim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The v850e2v3sim BSP
-#
-[global]
-bsp:                 none,    none,     'v850e2v3sim'
-
-[v850e2v3sim]
-v850e2v3sim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-v850e2v3sim_arch:            none,    none,     'v850'
-gdb_script:          none,    none,     'v850e2v3sim_gdb_script'
-v850e2v3sim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/v850esim-run.mc b/tester/rtems/testing/bsps/v850esim-run.ini
index 996de8f..b652bdf 100644
--- a/tester/rtems/testing/bsps/v850esim-run.mc
+++ b/tester/rtems/testing/bsps/v850esim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The v850esim BSP
 #
-[global]
-bsp:              none,    none,     'v850esim'
-
 [v850esim]
-v850esim:              none,    none,     '%{_rtscripts}/run.cfg'
-v850esim_arch:         none,    none,     'v850'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = v850
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850esim.ini b/tester/rtems/testing/bsps/v850esim.ini
new file mode 100644
index 0000000..46b8380
--- /dev/null
+++ b/tester/rtems/testing/bsps/v850esim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The v850esim BSP
+#
+[v850esim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = v850
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/v850esim.mc b/tester/rtems/testing/bsps/v850esim.mc
deleted file mode 100644
index 57f17b7..0000000
--- a/tester/rtems/testing/bsps/v850esim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The v850esim BSP
-#
-[global]
-bsp:                 none,    none,     'v850esim'
-
-[v850esim]
-v850esim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-v850esim_arch:            none,    none,     'v850'
-gdb_script:          none,    none,     'v850esim_gdb_script'
-v850esim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/v850essim-run.mc b/tester/rtems/testing/bsps/v850essim-run.ini
index 5ee6d10..5f56dc7 100644
--- a/tester/rtems/testing/bsps/v850essim-run.mc
+++ b/tester/rtems/testing/bsps/v850essim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The v850essim BSP
 #
-[global]
-bsp:              none,    none,     'v850essim'
-
 [v850essim]
-v850essim:              none,    none,     '%{_rtscripts}/run.cfg'
-v850essim_arch:         none,    none,     'v850'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = v850
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850essim.ini b/tester/rtems/testing/bsps/v850essim.ini
new file mode 100644
index 0000000..9047d8f
--- /dev/null
+++ b/tester/rtems/testing/bsps/v850essim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The v850essim BSP
+#
+[v850essim]
+tester         = %{_rtscripts}/gdb.cfg
+arch           = v850
+gdb_script     = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/v850essim.mc b/tester/rtems/testing/bsps/v850essim.mc
deleted file mode 100644
index 7a1c0fe..0000000
--- a/tester/rtems/testing/bsps/v850essim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The v850essim BSP
-#
-[global]
-bsp:                 none,    none,     'v850essim'
-
-[v850essim]
-v850essim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-v850essim_arch:            none,    none,     'v850'
-gdb_script:          none,    none,     'v850essim_gdb_script'
-v850essim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/v850sim-run.mc b/tester/rtems/testing/bsps/v850sim-run.ini
index 94c931a..e71f28c 100644
--- a/tester/rtems/testing/bsps/v850sim-run.mc
+++ b/tester/rtems/testing/bsps/v850sim-run.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The v850sim BSP
 #
-[global]
-bsp:              none,    none,     'v850sim'
-
 [v850sim]
-v850sim:              none,    none,     '%{_rtscripts}/run.cfg'
-v850sim_arch:         none,    none,     'v850'
-bsp_run_cmd:      none,    none,     '%{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run'
-bsp_run_opts:     none,    none,     '-a -nouartrx'
+tester       = %{_rtscripts}/run.cfg
+arch         = v850
+bsp_run_cmd  = %{rtems_tools}/%{bsp_arch}-rtems%{rtems_version}-run
+bsp_run_opts = -a -nouartrx
diff --git a/tester/rtems/testing/bsps/v850sim.ini b/tester/rtems/testing/bsps/v850sim.ini
new file mode 100644
index 0000000..211b859
--- /dev/null
+++ b/tester/rtems/testing/bsps/v850sim.ini
@@ -0,0 +1,40 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2015 On-Line Applications Research Corporation (OAR).
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The v850sim BSP
+#
+[v850sim]
+tester        = %{_rtscripts}/gdb.cfg
+arch          = v850
+gdb_script    = bsp_gdb_script
+bsp_gdb_script = target sim
+                 load
+                 run
diff --git a/tester/rtems/testing/bsps/v850sim.mc b/tester/rtems/testing/bsps/v850sim.mc
deleted file mode 100644
index 3494bcc..0000000
--- a/tester/rtems/testing/bsps/v850sim.mc
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2015 On-Line Applications Research Corporation (OAR).
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The v850sim BSP
-#
-[global]
-bsp:                 none,    none,     'v850sim'
-
-[v850sim]
-v850sim:                 none,    none,     '%{_rtscripts}/gdb.cfg'
-v850sim_arch:            none,    none,     'v850'
-gdb_script:          none,    none,     'v850sim_gdb_script'
-v850sim_gdb_script:      none,    none,     '''target sim
-                                           load
-                                           run'''
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.mc b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
index 6c627a8..843e3fa 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.mc
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu.ini
@@ -29,25 +29,9 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The Xilinx Zynq A9 QEMU BSP
 #
-[global]
-bsp:                      none,    none,     'xilinx_zynq_a9_qemu'
-
 [xilinx_zynq_a9_qemu]
-xilinx_zynq_a9_qemu:      none,    none,  '%{_rtscripts}/qemu.cfg'
-xilinx_zynq_a9_qemu_arch: none,    none,  'arm'
-xilinx_zynq_a9_qemu_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M'
+tester        = %{_rtscripts}/qemu.cfg
+arch          = arm
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.mc b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
index f91a036..a1e3323 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.mc
+++ b/tester/rtems/testing/bsps/xilinx_zynq_a9_qemu_smp.ini
@@ -29,26 +29,10 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The Xilinx Zynq A9 QEMU BSP
 #
-[global]
-bsp:                      none,    none,  'xilinx_zynq_a9_qemu'
-jobs:                     none,    none,  'half'
-
 [xilinx_zynq_a9_qemu]
-xilinx_zynq_a9_qemu:      none,    none,  '%{_rtscripts}/qemu.cfg'
-xilinx_zynq_a9_qemu_arch: none,    none,  'arm'
-xilinx_zynq_a9_qemu_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M -smp cpus=2'
+jobs          = half
+tester        = %{_rtscripts}/qemu.cfg
+arch          = arm
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 256M -smp cpus=2
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.mc b/tester/rtems/testing/bsps/xilinx_zynq_zc706.ini
index d5acc57..34e1cff 100644
--- a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.mc
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zc706.ini
@@ -29,26 +29,12 @@
 #
 
 #
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
 # The Xilinx Zync ZC706 board connected via OpenOCD and a JTAG pod. The console
 # is connected to a tty device.
 #
-[global]
-bsp:                    none,    none,   'xilinx_zynq_zc706'
-
 [xilinx_zynq_zc706]
-xilinx_zynq_zc706:      none,    none,  '%{_rtscripts}/qemu.cfg'
-xilinx_zynq_zc706_arch: none,    none,  'arm'
-xilinx_zynq_zc706_opts: none,    none,  '%{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 1024M'
+jobs       = 1
+tester     = %{_rtscripts}/gdb.cfg
+arch       = arm
+gdb_script = bsp_gdb_script
+requires   = bsp_tty_dev, bsp_gdb_script
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zc706.mc b/tester/rtems/testing/bsps/xilinx_zynq_zc706.mc
deleted file mode 100644
index fc427ff..0000000
--- a/tester/rtems/testing/bsps/xilinx_zynq_zc706.mc
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The Xilinx Zync ZC706 board connected via OpenOCD and a JTAG pod. The console
-# is connected to a tty device.
-#
-[global]
-bsp:                          none,    none,   'xilinx_zynq_zc706'
-jobs:                         none,    none,   '1'
-
-[xilinx_zynq_zc706]
-xilinx_zynq_zc706:            none,    none,   '%{_rtscripts}/gdb.cfg'
-xilinx_zynq_zc706_arch:       none,    none,   'arm'
-#bsp_tty_dev:                  none,    none,   '/dev/cuaU0'
-bsp_tty_dev:                  none,    none,   '/dev/cu.SLAB_USBtoUART'
-gdb_script:                   none,    none,   'xilinx_zynq_zc706_gdb_script'
-xilinx_zynq_zc706_gdb_script: none,    none,   '''target remote kaka:3333
-mon load_image /home/chris/development/si/work/hydra/boot/xilinx-zynq-fsbl/build/arm-rtems4.11-xilinx_zynq_zc706/hydra-fsbl.elf 0 elf
-                                                  mon resume 0
-                                                  mon sleep 4000
-                                                  mon halt
-                                                  load
-                                                  b bsp_reset
-                                                  continue'''
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
new file mode 100644
index 0000000..6f0f02b
--- /dev/null
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zc706_qemu.ini
@@ -0,0 +1,37 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2014 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The Xilinx Zync ZC706 running QEMU
+#
+[xilinx_zynq_zc706]
+tester        = %{_rtscripts}/qemu.cfg
+arch          = arm
+bsp_qemu_opts = %{qemu_opts_base} %{qemu_opts_no_net} -M xilinx-zynq-a9 -m 1024M
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini b/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini
new file mode 100644
index 0000000..e8fa563
--- /dev/null
+++ b/tester/rtems/testing/bsps/xilinx_zynq_zedboard.ini
@@ -0,0 +1,42 @@
+#
+# RTEMS Tools Project (http://www.rtems.org/)
+# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
+# All rights reserved.
+#
+# This file is part of the RTEMS Tools package in 'rtems-tools'.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# The Xilinx Zynq Zedboard and Microzed board connected via TFTP. The console
+# is connected to a telnet tty device.
+#
+[xilinx_zynq_zedboard]
+jobs               = 1
+tester             = %{_rtscripts}/tftp.cfg
+arch               = arm
+test_restarts      = 3
+target_reset_regex = ^No ethernet found.*|^BOOTP broadcast 6.*|^.+complete\.+ TIMEOUT.*
+target_start_regex = ^U-Boot SPL .*
+requires           = target_on_command, target_off_command, target_reset_command, bsp_tty_dev
diff --git a/tester/rtems/testing/bsps/xilinx_zynq_zedboard.mc b/tester/rtems/testing/bsps/xilinx_zynq_zedboard.mc
deleted file mode 100644
index af10810..0000000
--- a/tester/rtems/testing/bsps/xilinx_zynq_zedboard.mc
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2010-2017 Chris Johns (chrisj@rtems.org)
-# All rights reserved.
-#
-# This file is part of the RTEMS Tools package in 'rtems-tools'.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# All paths in defaults must be Unix format. Do not store any Windows format
-# paths in the defaults.
-#
-# Every entry must describe the type of checking a host must pass.
-#
-# Records:
-#  key: type, attribute, value
-#   type     : none, dir, exe, triplet
-#   attribute: none, required, optional
-#   value    : 'single line', '''multi line'''
-#
-
-#
-# The Xilinx Zynq Zedboard and Microzed board connected via TFTP. The console
-# is connected to a telnet tty device.
-#
-[global]
-bsp:                       none,    none,   'xilinx_zynq_zedboard'
-jobs:                      none,    none,   '1'
-
-[xilinx_zynq_zedboard]
-xilinx_zynq_zedboard:      none,    none,   '%{_rtscripts}/tftp.cfg'
-xilinx_zynq_zedboard_arch: none,    none,   'arm'
-test_restarts:             none,    none,   '3'
-target_pretest_command:    none,    none,   'rtems-zynq-mkimg @EXE@'
-target_exe_filter_command: none,    none,   '/\.exe/.exe.img/'
-target_on_command:         none,    none,   'wemo-reset CSEng1 0 && sleep 4 && wemo-reset CSEng1 -1'
-target_off_command:        none,    none,   'wemo-reset CSEng1 0'
-target_reset_command:      none,    none,   'wemo-reset CSEng1 3'
-target_reset_regex:        none,    none,   '^No ethernet found.*|^BOOTP broadcast 6.*|^.+complete\.+ TIMEOUT.*'
-target_start_regex:        none,    none,   '^U-Boot SPL .*'
-bsp_tty_dev:               none,    none,   'tuke:30005'
diff --git a/tester/rtems/testing/qemu.cfg b/tester/rtems/testing/qemu.cfg
index 4c5d256..db5b6b2 100644
--- a/tester/rtems/testing/qemu.cfg
+++ b/tester/rtems/testing/qemu.cfg
@@ -57,8 +57,11 @@
 #
 # Qemu executable
 #
+%ifn %{defined bsp_qemu_opts}
+ %define bsp_qemu_opts %{nil}
+%endif
 %define qemu_cmd  qemu-system-%{bsp_arch}
-%define qemu_opts %{bsp_opts}
+%define qemu_opts %{bsp_qemu_opts}
 
 #
 # Executable