Subzero, MIPS32: Cross-testing enabled for MIPS32

pydir/crosstest_generator.py

 #!/usr/bin/env python2
 
 import argparse
 import collections
 import ConfigParser
 import os
 import shutil
 import sys
 
 from utils import shellcmd
@@ skipping 21 matching lines @@
 def RunNativePrefix(toolchain_root, target, attr, run_cmd):
   """Returns a prefix for running an executable for the target.
 
   For example, we may be running an ARM or MIPS target executable on an
   x86 machine and need to use an emulator.
   """
   arch_map = { 'x8632' : '',
                'x8664' : '',
                'arm32' : os.path.join(toolchain_root, 'arm_trusted',
                                       'run_under_qemu_arm'),
+               'mips32': os.path.join(toolchain_root, 'mips_trusted',
+                                      'run_under_qemu_mips32'),
              }
   attr_map = collections.defaultdict(str, {
       'arm32-neon': ' -cpu cortex-a9',
-      'arm32-hwdiv-arm': ' -cpu cortex-a15' })
+      'arm32-hwdiv-arm': ' -cpu cortex-a15',
+      'mips32-base': ' -cpu mips32r5-generic'})
   prefix = arch_map[target] + attr_map[target + '-' + attr]
   return (prefix + ' ' + run_cmd) if prefix else run_cmd
 
 def NonsfiLoaderArch(target):
   """Returns the arch for the nonsfi_loader"""
   arch_map = { 'arm32' : 'arm',
                'x8632' : 'x86-32',
+               'mips32' : 'mips',
              }
   return arch_map[target]
 
 
 def main():
   """Framework for cross test generation and execution.
 
   Builds and executes cross tests from the space of all possible attribute
   combinations.  The space can be restricted by providing subsets of attributes
   to specifically include or exclude.
   """
   # pypath is where to find other Subzero python scripts.
   pypath = os.path.abspath(os.path.dirname(sys.argv[0]))
   root = FindBaseNaCl()
 
   # The rest of the attribute sets.
-  targets = [ 'x8632', 'x8664', 'arm32' ]
+  targets = [ 'x8632', 'x8664', 'arm32', 'mips32' ]
   sandboxing = [ 'native', 'sandbox', 'nonsfi' ]
   opt_levels = [ 'Om1', 'O2' ]
   arch_attrs = { 'x8632': [ 'sse2', 'sse4.1' ],
                  'x8664': [ 'sse2', 'sse4.1' ],
-                 'arm32': [ 'neon', 'hwdiv-arm' ] }
+                 'arm32': [ 'neon', 'hwdiv-arm' ],
+                 'mips32': ['base'] }

[Jim Stichnoth, 2016/08/23 14:56:49]

[ 'base' ]
for consistency

[obucinac, 2016/09/05 16:55:59]

Done.

   flat_attrs = []
   for v in arch_attrs.values():
     flat_attrs += v
   arch_flags = { 'x8632': [],
                  'x8664': [],
-                 'arm32': [] }
+                 'arm32': [],
+                 'mips32': []}

[Jim Stichnoth, 2016/08/23 14:56:49]

Add back in the space before the closing brace?
  [] }

[obucinac, 2016/09/05 16:55:59]

Done.

   # all_keys is only used in the help text.
   all_keys = '; '.join([' '.join(targets), ' '.join(sandboxing),
                         ' '.join(opt_levels), ' '.join(flat_attrs)])
 
   argparser = argparse.ArgumentParser(
     description='  ' + main.__doc__ +
     'The set of attributes is the set of tests plus the following:\n' +
     all_keys, formatter_class=argparse.RawTextHelpFormatter)
   argparser.add_argument('--config', default='crosstest.cfg', dest='config',
                          metavar='FILE', help='Test configuration file')
@@ skipping 124 matching lines @@
                            echo=args.verbose)
                 if (args.defer):
                   deferred_cmds.append(run_cmd)
                 else:
                   shellcmd(run_cmd, echo=True)
   for run_cmd in deferred_cmds:
     shellcmd(run_cmd, echo=True)
 
 if __name__ == '__main__':
   main()