| OLD | NEW |
| 1 #!/usr/bin/env python2 | 1 #!/usr/bin/env python2 |
| 2 | 2 |
| 3 import argparse | 3 import argparse |
| 4 import ConfigParser | 4 import ConfigParser |
| 5 import os | 5 import os |
| 6 import shutil | 6 import shutil |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 from utils import shellcmd | 9 from utils import shellcmd |
| 10 from utils import FindBaseNaCl | 10 from utils import FindBaseNaCl |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 sandboxing = [ 'native', 'sandbox', 'nonsfi' ] | 59 sandboxing = [ 'native', 'sandbox', 'nonsfi' ] |
| 60 opt_levels = [ 'Om1', 'O2' ] | 60 opt_levels = [ 'Om1', 'O2' ] |
| 61 arch_attrs = { 'x8632': [ 'sse2', 'sse4.1' ], | 61 arch_attrs = { 'x8632': [ 'sse2', 'sse4.1' ], |
| 62 'x8664': [ 'sse2', 'sse4.1' ], | 62 'x8664': [ 'sse2', 'sse4.1' ], |
| 63 'arm32': [ 'neon', 'hwdiv-arm' ] } | 63 'arm32': [ 'neon', 'hwdiv-arm' ] } |
| 64 flat_attrs = [] | 64 flat_attrs = [] |
| 65 for v in arch_attrs.values(): | 65 for v in arch_attrs.values(): |
| 66 flat_attrs += v | 66 flat_attrs += v |
| 67 arch_flags = { 'x8632': [], | 67 arch_flags = { 'x8632': [], |
| 68 'x8664': [], | 68 'x8664': [], |
| 69 # ARM doesn't have an ELF writer yet, and iasm does not | 69 'arm32': [] } |
| 70 # support sandboxing yet. | |
| 71 'arm32': ['--filetype=asm'] } | |
| 72 # all_keys is only used in the help text. | 70 # all_keys is only used in the help text. |
| 73 all_keys = '; '.join([' '.join(targets), ' '.join(sandboxing), | 71 all_keys = '; '.join([' '.join(targets), ' '.join(sandboxing), |
| 74 ' '.join(opt_levels), ' '.join(flat_attrs)]) | 72 ' '.join(opt_levels), ' '.join(flat_attrs)]) |
| 75 | 73 |
| 76 argparser = argparse.ArgumentParser( | 74 argparser = argparse.ArgumentParser( |
| 77 description=' ' + main.__doc__ + | 75 description=' ' + main.__doc__ + |
| 78 'The set of attributes is the set of tests plus the following:\n' + | 76 'The set of attributes is the set of tests plus the following:\n' + |
| 79 all_keys, formatter_class=argparse.RawTextHelpFormatter) | 77 all_keys, formatter_class=argparse.RawTextHelpFormatter) |
| 80 argparser.add_argument('--config', default='crosstest.cfg', dest='config', | 78 argparser.add_argument('--config', default='crosstest.cfg', dest='config', |
| 81 metavar='FILE', help='Test configuration file') | 79 metavar='FILE', help='Test configuration file') |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 echo=args.verbose) | 197 echo=args.verbose) |
| 200 if (args.defer): | 198 if (args.defer): |
| 201 deferred_cmds.append(run_cmd) | 199 deferred_cmds.append(run_cmd) |
| 202 else: | 200 else: |
| 203 shellcmd(run_cmd, echo=True) | 201 shellcmd(run_cmd, echo=True) |
| 204 for run_cmd in deferred_cmds: | 202 for run_cmd in deferred_cmds: |
| 205 shellcmd(run_cmd, echo=True) | 203 shellcmd(run_cmd, echo=True) |
| 206 | 204 |
| 207 if __name__ == '__main__': | 205 if __name__ == '__main__': |
| 208 main() | 206 main() |
| OLD | NEW |